[FFmpeg-cvslog] Merge remote-tracking branch 'qatar/master'
Michael Niedermayer
git at videolan.org
Mon Sep 17 15:21:35 CEST 2012
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Mon Sep 17 15:12:25 2012 +0200| [291b220377d43adbecc86da84f43aed547957ffc] | committer: Michael Niedermayer
Merge remote-tracking branch 'qatar/master'
* qatar/master:
avconv: flush filtered frames before reconfiguring filters
mov: stsd entries must be at least 16 byte
mov: detect EOF in mov_read_dref()
file: return proper error on seek failures
Conflicts:
libavformat/file.c
libavformat/mov.c
Merged-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=291b220377d43adbecc86da84f43aed547957ffc
---
More information about the ffmpeg-cvslog
mailing list