diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-01-17 01:58:54 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-01-17 01:58:54 +0100 |
| commit | 52cea9ce9209bf4ee0af6475b7db880e962cb924 (patch) | |
| tree | 43eb6d367ddce28829376d36ebffd7eed53c2a39 /libavformat/utils.c | |
| parent | 4fc22e85c0117fc6f1596ff4bfd89ac00c17cfea (diff) | |
| parent | 01a4e7f623a2e6dc95862f9a56c777f058d7bfaf (diff) | |
| download | ffmpeg-52cea9ce9209bf4ee0af6475b7db880e962cb924.tar.gz | |
Merge commit '01a4e7f623a2e6dc95862f9a56c777f058d7bfaf' into release/0.10
* commit '01a4e7f623a2e6dc95862f9a56c777f058d7bfaf':
lavf: Bump minor version to distinguish branch and master version numbers
vp6: properly fail on unsupported feature
mp3: properly forward mp_decode_frame errors
mpeg12: do not decode extradata more than once.
indeo3: when freeing buffers, set pointers referencing them to NULL as well
indeo3: ensure that decoded cell data is in 7-bit range as presumed by decoder
avconv: fix copying per-stream metadata.
id3v2: fix reading unsynchronized frames.
h264: Fix parameters to ff_er_add_slice() call
build: fix 'clean' target
Conflicts:
avconv.c
libavcodec/mpeg12.h
libavformat/id3v2.c
libavformat/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/utils.c')
0 files changed, 0 insertions, 0 deletions