diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-03-12 21:06:30 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-03-12 21:06:30 +0100 |
| commit | 771919e11fcdf6fb518c04d55b83fb3e50c35a58 (patch) | |
| tree | b62c39a60e32e81665830b97c139ac7e14bacd10 /libavcodec/psymodel.c | |
| parent | 49e87819d09e4c7a7bbbfa19dff12c2d0db29584 (diff) | |
| parent | 6deae8e0530a885b76f149841ed4899cb438ec23 (diff) | |
| download | ffmpeg-771919e11fcdf6fb518c04d55b83fb3e50c35a58.tar.gz | |
Merge commit '6deae8e0530a885b76f149841ed4899cb438ec23'
* commit '6deae8e0530a885b76f149841ed4899cb438ec23':
FATE: remove the -dct option from some decoding tests.
avconv: use a local variable for InputFile in open_input_file().
Conflicts:
tests/fate/microsoft.mak
tests/fate/real.mak
tests/fate/video.mak
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/psymodel.c')
0 files changed, 0 insertions, 0 deletions