diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-01-09 20:51:17 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-01-09 20:51:17 +0100 |
| commit | 1cf0f27985965c28049b7a8481c859867dad3948 (patch) | |
| tree | 394a7626c12261e01aca83e2b147461df6b863ea /libswresample/swresample.c | |
| parent | aefb99f2c0554a10f695eed569f0b94d7e462a34 (diff) | |
| parent | 7e4e010b80e76862e83afbd41c25d50e72f0b44c (diff) | |
| download | ffmpeg-1cf0f27985965c28049b7a8481c859867dad3948.tar.gz | |
Merge commit '7e4e010b80e76862e83afbd41c25d50e72f0b44c'
* commit '7e4e010b80e76862e83afbd41c25d50e72f0b44c':
mpeg4audio: check the init_get_bits() return value
Conflicts:
libavcodec/mpeg4audio.c
See: deefdf9788467edd262b9c29a4f6e33d2ae84b8c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libswresample/swresample.c')
0 files changed, 0 insertions, 0 deletions