ffmpeg | branch: master | Michael Niedermayer <michae...@gmx.at> | Mon Dec 8
01:39:43 2014 +0100| [dce10f8178343d3c8b849f2470028e190a42a27c] | committer:
Michael Niedermayer
Merge commit '4f5906a1d7f4368cec43b224e8a675f54d2001d2'
* commit '4f5906a1d7f4368cec43b224e8a675f54d2001d2':
latm: Do not give a score for a single instance
Conflicts:
libavformat/rawdec.c
No change, the buggy case was not part of FFmpeg
Merged-by: Michael Niedermayer <michae...@gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=dce10f8178343d3c8b849f2470028e190a42a27c
---
_______________________________________________
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
