Changeset f5d6541b in ffmpeg

Timestamp:

Nov 29, 2013, 10:46:30 PM (11 years ago)

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

26b526e7

Parents:

91c63cb (diff), ad09f525 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge commit 'ad09f52586eae4c5473c3a6a803d73e1ba56c0eb'

• commit 'ad09f52586eae4c5473c3a6a803d73e1ba56c0eb': h263dec: remove commented out cruft

Conflicts:

libavcodec/h263dec.c

Merged-by: Michael Niedermayer <​michaelni@gmx.at>

(No files)