Changeset 56e12278 in ffmpeg

Timestamp:

Nov 19, 2013, 2:56:53 AM (11 years ago)

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

85403685

Parents:

f0f04fd (diff), a553c6a3 (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/19/13 02:48:15)

git-committer:

Michael Niedermayer <michaelni@gmx.at> (11/19/13 02:56:53)

Message:

Merge commit 'a553c6a347d3d28d7ee44c3df3d5c4ee780dba23'

• commit 'a553c6a347d3d28d7ee44c3df3d5c4ee780dba23': lavc: use buf[0] instead of data[0] in checks whether a frame is allocated

Conflicts:

libavcodec/h264_refs.c
libavcodec/mpegvideo.c

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

(No files)