Merge remote-tracking branch 'qatar/master'
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 17 Sep 2012 13:12:25 +0000 (15:12 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 17 Sep 2012 13:15:43 +0000 (15:15 +0200)
commit291b220377d43adbecc86da84f43aed547957ffc
tree1ed87946e01e30c2b989c8822503c61ff99ad0c8
parent1ad63ff14adb652996c4604da59a330cef0d494e
parent2f34021d57b1343bb01b377a4797bef7cbc7be3c
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>
libavformat/file.c
libavformat/mov.c