ffmpeg | branch: master | Michael Niedermayer <[email protected]> | 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 <[email protected]>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=28b1698a7cccded1df32a543321fd24af928e06c
---
_______________________________________________
ffmpeg-cvslog mailing list
[email protected]
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
