Merge commit 'b114f6d48a06a4dad6882bc83e07463905f004c4'
authorMichael Niedermayer <michaelni@gmx.at>
Sat, 27 Jun 2015 17:21:25 +0000 (19:21 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Sat, 27 Jun 2015 18:22:45 +0000 (20:22 +0200)
commita50b00822784f6b098eb634132ad75394f1d26c0
tree6b6ed6e4060c4ca6bc0c3c7ef06a617376a7a36e
parent93e7b7fb346441dd2bafa8caef4df596f1fae1cb
parentb114f6d48a06a4dad6882bc83e07463905f004c4
Merge commit 'b114f6d48a06a4dad6882bc83e07463905f004c4'

* commit 'b114f6d48a06a4dad6882bc83e07463905f004c4':
  avconv: factor out flushing the filters

Conflicts:
ffmpeg.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
ffmpeg.c