diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-03-23 12:24:05 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-03-23 12:26:08 +0100 |
| commit | 8b63eeb6b1c2f9e7d762f32dbd42dae124591314 (patch) | |
| tree | 22c4f47fceef730a0f193cd168514ea65baeee66 /COPYING.GPLv3 | |
| parent | 9bb6504e3bff2e00610f52cc41938aa8c2a3ad4c (diff) | |
| parent | 3f15b301fa61547f59f1452b14edf14e5673fdd2 (diff) | |
| download | ffmpeg-8b63eeb6b1c2f9e7d762f32dbd42dae124591314.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
fate: add test for cropping h264 to container dimensions
FATE: add a tscc2 test.
tscc2: allocate AVFrame properly.
Conflicts:
libavcodec/tscc2.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'COPYING.GPLv3')
0 files changed, 0 insertions, 0 deletions