eessppeelllloo/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2026-01-09 15:45:27 +01:00
Code Issues Packages Projects Releases Wiki Activity
Files
d7fbb63122b87347e57cd8a586adff09f8de5921
ffmpeg/libavcodec/pthread_frame.c
Michael Niedermayer 56e122787e 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>
2013-11-19 03:56:53 +01:00

28 KiB
Raw Blame History

View Raw
Reference in New Issue View Git Blame Copy Permalink