diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-03-10 18:14:20 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-03-10 18:14:20 +0100 |
| commit | 0d82c3a0ca6c5ed1e757a826b966687382f0180e (patch) | |
| tree | 32714aaad2ac2b838073b264395f968b13b60e12 /libavcodec/mpegaudio_tablegen.h | |
| parent | b7a750f67f68b41d5f3215906a5282b9cb7937d3 (diff) | |
| parent | 979f77b0dc40571761999633a38d97be9a1670c8 (diff) | |
| download | ffmpeg-0d82c3a0ca6c5ed1e757a826b966687382f0180e.tar.gz | |
Merge commit '979f77b0dc40571761999633a38d97be9a1670c8' into release/0.10
* commit '979f77b0dc40571761999633a38d97be9a1670c8':
h264: check that an IDR NAL only contains I slices
mov: Free an earlier allocated array if allocating a new one
segafilm: fix leaks if reading the header fails
h264_cavlc: check the size of the intra PCM data.
cavs: Check for negative cbp
avi: DV in AVI must be considered single stream
avutil: use align == 0 for default alignment in audio sample buffer functions
Conflicts:
libavcodec/cavsdec.c
libavutil/avutil.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/mpegaudio_tablegen.h')
0 files changed, 0 insertions, 0 deletions