diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-01-17 23:00:16 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-01-17 23:00:30 +0100 |
| commit | 05b1ac24709b4e6ccc96d6c41c14ef915110a868 (patch) | |
| tree | 4ee827273c8779a27b56397cb1fc5c4f2da44c58 /libavfilter/af_astats.c | |
| parent | cc598bf7dc8a4b0970b5c654de33706c03dac611 (diff) | |
| parent | bfe18be88a66da25b60a091de6011197dcb231fd (diff) | |
| download | ffmpeg-05b1ac24709b4e6ccc96d6c41c14ef915110a868.tar.gz | |
Merge commit 'bfe18be88a66da25b60a091de6011197dcb231fd' into release/2.4
* commit 'bfe18be88a66da25b60a091de6011197dcb231fd':
mpeg4audio: check the init_get_bits() return value
Conflicts:
libavcodec/mpeg4audio.c
See: deefdf9788467edd262b9c29a4f6e33d2ae84b8c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavfilter/af_astats.c')
0 files changed, 0 insertions, 0 deletions