ffmpeg | branch: master | Michael Niedermayer <michae...@gmx.at> | Fri Aug 22
19:01:26 2014 +0200| [350dd8534575e89a8ed5f2bdafc24651a82338e5] | committer:
Michael Niedermayer
Merge commit '4d6c5152849e23a4cc0f6a6ac2880c01ebcd301b'
* commit '4d6c5152849e23a4cc0f6a6ac2880c01ebcd301b':
electronicarts: do not fail on zero-sized chunks
Conflicts:
libavformat/electronicarts.c
Merged-by: Michael Niedermayer <michae...@gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=350dd8534575e89a8ed5f2bdafc24651a82338e5
---
_______________________________________________
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
