[FFmpeg-cvslog] Merge commit 'a553c6a347d3d28d7ee44c3df3d5c4ee780dba23'

Michael Niedermayer git at videolan.org
Tue Nov 19 04:02:28 CET 2013


ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Tue Nov 19 03:48:15 2013 +0100| [56e122787e7362274b7ac342fde6e303259a5f57] | committer: Michael Niedermayer

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 at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=56e122787e7362274b7ac342fde6e303259a5f57
---





More information about the ffmpeg-cvslog mailing list