[FFmpeg-cvslog] Merge commit 'ce42316321145c435029dc288c2b5f1d48519dde'

Michael Niedermayer git at videolan.org
Sat Sep 27 03:34:58 CEST 2014


ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sat Sep 27 03:16:58 2014 +0200| [28b1698a7cccded1df32a543321fd24af928e06c] | committer: Michael Niedermayer

Merge commit 'ce42316321145c435029dc288c2b5f1d48519dde'

* commit 'ce42316321145c435029dc288c2b5f1d48519dde':
  h264: Always invoke the get_format() callback

Conflicts:
	libavcodec/h264_slice.c

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

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





More information about the ffmpeg-cvslog mailing list