[FFmpeg-cvslog] Merge commit 'bc98e8c0e0a8babfea35c98855e366b29cbe1191'

Michael Niedermayer git at videolan.org
Sat Mar 21 18:18:38 CET 2015


ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sat Mar 21 17:30:59 2015 +0100| [d511dc653062502ac7a86d9ef47ffeabd6f77364] | committer: Michael Niedermayer

Merge commit 'bc98e8c0e0a8babfea35c98855e366b29cbe1191'

* commit 'bc98e8c0e0a8babfea35c98855e366b29cbe1191':
  h264: move mb_field_decoding_flag into the per-slice context

Conflicts:
	libavcodec/h264_slice.c

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

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





More information about the ffmpeg-cvslog mailing list