Merge commit 'a553c6a3'
* commit 'a553c6a3': 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>
Showing
Please
register
or
sign in
to comment