Michael Niedermayer 291b220377 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@gmx.at>

2012-09-17 15:15:43 +02:00

5.1 KiB

Raw Blame History

View Raw