diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-09-25 23:35:30 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-09-25 23:35:30 +0200 |
| commit | c6a4397410ab5f1b22cbc9f1ccb3126b3e5d6125 (patch) | |
| tree | c454ad645169a69a422cae0f1fa30f9188c50d7c /libavformat/mp3enc.c | |
| parent | 210a437e105fbd92f1dd9c2c82f4a5efd80ca8fd (diff) | |
| parent | 37e69e2dee7c5167083bb42d669f73f038111a79 (diff) | |
| download | ffmpeg-c6a4397410ab5f1b22cbc9f1ccb3126b3e5d6125.tar.gz | |
Merge commit '37e69e2dee7c5167083bb42d669f73f038111a79' into release/0.10
* commit '37e69e2dee7c5167083bb42d669f73f038111a79':
ac3: Clean up the error paths
ac3: Do not clash with normal AVERROR
dxa: Make sure the reference frame exists
h261: check the mtype index
segafilm: Error out on impossible packet size
ogg: Always alloc the private context in vorbis_header
vc1: check mb_height validity.
Conflicts:
libavcodec/h261dec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/mp3enc.c')
0 files changed, 0 insertions, 0 deletions