diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-11-28 00:35:35 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-11-28 00:35:35 +0100 |
| commit | 86b532898d8a2dbd9ddd303434bd8a5a395b15a7 (patch) | |
| tree | b6831e6aa8dbda10b0b9bd21d3ce7674b03ef6e4 /libavformat/electronicarts.c | |
| parent | 944570906b7433846352cbb14730e96e94d232ab (diff) | |
| parent | 12700b0219521a5f20c8ba47b3ad7857ea9e0554 (diff) | |
| download | ffmpeg-86b532898d8a2dbd9ddd303434bd8a5a395b15a7.tar.gz | |
Merge commit '12700b0219521a5f20c8ba47b3ad7857ea9e0554' into release/2.4
* commit '12700b0219521a5f20c8ba47b3ad7857ea9e0554':
mp3enc: fix a triggerable assert
Conflicts:
libavformat/mp3enc.c
No change as the faulty assert is not in FFmpeg
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/electronicarts.c')
0 files changed, 0 insertions, 0 deletions