[FFmpeg-cvslog] Merge commit '9a5e4fbec870c7d466b7a0aec92c70778efc96b5'
Michael Niedermayer
git at videolan.org
Sat Jun 27 20:41:30 CEST 2015
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sat Jun 27 20:34:42 2015 +0200| [a5f409bcc09176ad9443697d95da6a1edf3944aa] | committer: Michael Niedermayer
Merge commit '9a5e4fbec870c7d466b7a0aec92c70778efc96b5'
* commit '9a5e4fbec870c7d466b7a0aec92c70778efc96b5':
avconv: do not stop processing the input packet on decoding error
Conflicts:
ffmpeg.c
Merged-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=a5f409bcc09176ad9443697d95da6a1edf3944aa
---
More information about the ffmpeg-cvslog
mailing list