ffmpeg | branch: cf1ccfffa4b72d6dc39ea8a04bc391a4ff268fb8 | Hendrik Leppkes
<h.lepp...@gmail.com> | Sun Aug 2 10:51:53 2015 +0200|
[db395bef7f9a0c8af782835aefb358e56c6bfb46] | committer: Hendrik Leppkes
Merge commit '80ea66112817c719b476de8f7d8d3b325f4c7dd1'
* commit '80ea66112817c719b476de8f7d8d3b325f4c7dd1':
avcodec: h264: Extract decoder methods
Conflicts:
libavcodec/h264_sei.c
Merged-by: Hendrik Leppkes <h.lepp...@gmail.com>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=db395bef7f9a0c8af782835aefb358e56c6bfb46
---
_______________________________________________
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
