ffmpeg | branch: master | Michael Niedermayer <michae...@gmx.at> | Sun Apr 5
20:43:32 2015 +0200| [cde98920da78801a40f9120cfef650ac05a22224] | committer:
Michael Niedermayer
Merge commit '84f226a3bcd8b39801a4c9051c033ab7d61aaf76'
* commit '84f226a3bcd8b39801a4c9051c033ab7d61aaf76':
h264: use the correct SPS during PPS parsing
Conflicts:
libavcodec/h264_ps.c
See: dc35b77b28f40c99d27c073fe2c22219ba600202
Merged-by: Michael Niedermayer <michae...@gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=cde98920da78801a40f9120cfef650ac05a22224
---
_______________________________________________
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
