Merge commit 'a553c6a347d3d28d7ee44c3df3d5c4ee780dba23'
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 19 Nov 2013 02:48:15 +0000 (03:48 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 19 Nov 2013 02:56:53 +0000 (03:56 +0100)
commit56e122787e7362274b7ac342fde6e303259a5f57
tree6b87895ea4cc938fea927e5e27ceed77c9519e6a
parentf0f04fd8429475999bde08943e29a678cab3926e
parenta553c6a347d3d28d7ee44c3df3d5c4ee780dba23
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>
libavcodec/h264.c
libavcodec/h264_refs.c
libavcodec/mpegvideo.c
libavcodec/pthread_frame.c