Changeset 9f32048d in ffmpeg

Timestamp:

Nov 14, 2013, 1:11:03 PM (11 years ago)

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

2925571

Parents:

dbfa4317 (diff), aa241229 (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.

git-author:

Michael Niedermayer <michaelni@gmx.at> (11/14/13 13:03:20)

git-committer:

Michael Niedermayer <michaelni@gmx.at> (11/14/13 13:11:03)

Message:

Merge commit 'aa241229891173b0357eee04e6ca78f806cc9c0c'

• commit 'aa241229891173b0357eee04e6ca78f806cc9c0c': lavc: deprecate FF_MAX_B_FRAMES

Conflicts:

libavcodec/options_table.h

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

(No files)