diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-06-17 01:04:33 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-06-17 01:04:33 +0200 |
| commit | 95275551ef280deadb73d04bad0472486e497115 (patch) | |
| tree | 908ac496d72c0f95bb456053bf3a3e3ebf2b8b54 /libavresample/avresample-test.c | |
| parent | e99f324c143a2d825b2be260cb6a799dbfe97a10 (diff) | |
| parent | ee16a0ced01e6a33b7b01a0b21a0e07c1e1c7884 (diff) | |
| download | ffmpeg-95275551ef280deadb73d04bad0472486e497115.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
smacker: check frame size validity
Conflicts:
libavformat/smacker.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavresample/avresample-test.c')
0 files changed, 0 insertions, 0 deletions