diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-12-02 13:14:06 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-12-02 13:14:06 +0100 |
| commit | 9181faab68a6a6ee22c7490085e13ffac90d7119 (patch) | |
| tree | f758634a4827aa27cd4a10736faee9aef251beae /doc/examples/filtering_audio.c | |
| parent | bf219a564c421b9c9ce8f0c6c0e6ad549cbbdcd3 (diff) | |
| parent | 871d99ef77336069e5a8ece947c8160d9bc4d5ea (diff) | |
| download | ffmpeg-9181faab68a6a6ee22c7490085e13ffac90d7119.tar.gz | |
Merge commit '871d99ef77336069e5a8ece947c8160d9bc4d5ea' into release/2.2
* commit '871d99ef77336069e5a8ece947c8160d9bc4d5ea':
mp3enc: fix a triggerable assert
Conflicts:
libavformat/mp3enc.c
No change, the faulty assert was not in FFmpeg
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'doc/examples/filtering_audio.c')
0 files changed, 0 insertions, 0 deletions