diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-04-04 14:20:51 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-04-04 14:20:51 +0200 |
| commit | 208be6b54a91b7da699497d0bb361dbf542d6518 (patch) | |
| tree | 4a4e69948369ae7359b35c0933b1d4a22dc228cb /ffmpeg.c | |
| parent | cdafcf838cc7f559b67863183ad1283c97a9ae70 (diff) | |
| parent | d1016dccdcb10486245e5d7c186cc31af54b2a9c (diff) | |
| download | ffmpeg-208be6b54a91b7da699497d0bb361dbf542d6518.tar.gz | |
Merge commit 'd1016dccdcb10486245e5d7c186cc31af54b2a9c'
* commit 'd1016dccdcb10486245e5d7c186cc31af54b2a9c':
xmv: check audio track parameters validity.
bmv: check for len being valid in bmv_decode_frame().
Conflicts:
libavformat/xmv.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'ffmpeg.c')
0 files changed, 0 insertions, 0 deletions