diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-05-12 13:55:06 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-05-12 13:55:06 +0200 |
| commit | d2b9da2f3797de28fda72a96bf8f06608121c6ee (patch) | |
| tree | 39381af07baab573562abbf8c63a76c6a7716491 /ffprobe.c | |
| parent | 395538e0735e81a2efc14573e83e323c779f4b66 (diff) | |
| parent | c8462bd17f35f435192281a2ea4ce8008a7398d3 (diff) | |
| download | ffmpeg-d2b9da2f3797de28fda72a96bf8f06608121c6ee.tar.gz | |
Merge commit 'c8462bd17f35f435192281a2ea4ce8008a7398d3' into release/1.1
* commit 'c8462bd17f35f435192281a2ea4ce8008a7398d3':
mp3dec: fallback to generic seeking when a TOC is not present
svq1dec: clip motion vectors to the frame size.
svq1dec: check that the reference frame has the same dimensions as the current one
qdm2: check that the FFT size is a power of 2
Conflicts:
libavcodec/svq1dec.c
libavformat/mp3dec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'ffprobe.c')
0 files changed, 0 insertions, 0 deletions