diff options
| author | Clément Bœsch <cboesch@gopro.com> | 2017-03-15 14:25:46 +0100 |
|---|---|---|
| committer | Clément Bœsch <cboesch@gopro.com> | 2017-03-15 14:28:43 +0100 |
| commit | a283665693e1c9804b2736545dba77d0ee342f9e (patch) | |
| tree | 3caa047a3c52d62b55c1e536befa76d43f6daf87 /libswresample/resample.h | |
| parent | 67e2ba36ec5096a875e377fa1703c535e7eef081 (diff) | |
| parent | e46a6fb7732a7caef97a916a4f765ec0f779d195 (diff) | |
| download | ffmpeg-a283665693e1c9804b2736545dba77d0ee342f9e.tar.gz | |
Merge commit 'e46a6fb7732a7caef97a916a4f765ec0f779d195'
* commit 'e46a6fb7732a7caef97a916a4f765ec0f779d195':
avconv: Check that muxing_queue exists before reading from it
Mostly noop. This was fixed in FFmpeg in 7f7c494a3.
The merge makes the cosmetics match but does not include the weird
av_log().
Merged-by: Clément Bœsch <cboesch@gopro.com>
Diffstat (limited to 'libswresample/resample.h')
0 files changed, 0 insertions, 0 deletions