ffmpeg | branch: master | Michael Niedermayer <[email protected]> | Tue Aug 26 
22:01:45 2014 +0200| [570397c7311554f47d36574107e3d27cd53ec406] | committer: 
Michael Niedermayer

Merge commit 'e87f5e4e5f2e2e36b0b7826d708cda7049877af0'

* commit 'e87f5e4e5f2e2e36b0b7826d708cda7049877af0':
  h264: fully check cropping amount from sps

Conflicts:
        libavcodec/h264_slice.c

Merged-by: Michael Niedermayer <[email protected]>

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



_______________________________________________
ffmpeg-cvslog mailing list
[email protected]
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog

Reply via email to