ffmpeg | branch: master | Michael Niedermayer <michae...@gmx.at> | Tue Jun 30
20:59:36 2015 +0200| [2e9dcb82e5d54f54befe3c42b4d0bc9a6bd47016] | committer:
Michael Niedermayer
Merge commit '3e3056f2a020dd77efdf379dbd4c06a65b4a499a'
* commit '3e3056f2a020dd77efdf379dbd4c06a65b4a499a':
h264: Allow stream and container cropping at the same time
Conflicts:
libavcodec/h264_slice.c
Merged-by: Michael Niedermayer <michae...@gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=2e9dcb82e5d54f54befe3c42b4d0bc9a6bd47016
---
_______________________________________________
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
