diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-12-26 14:35:54 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-12-26 15:19:35 +0100 |
| commit | 39d178806d9111e0e4a1e9400d4df0d00093ad00 (patch) | |
| tree | 54c65a1fac9a8b7b71340e96af4ff22e291a2ffb /doc/syntax.texi | |
| parent | 075eaf8d6afcbce4a17380231c80a1c945e53239 (diff) | |
| parent | 1f4ea4e068f1131bff6c246308f52acbf1347cc2 (diff) | |
| download | ffmpeg-39d178806d9111e0e4a1e9400d4df0d00093ad00.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
mpegvideo: initialize videodsp with correct pixel depth
Conflicts:
libavcodec/mpegvideo.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'doc/syntax.texi')
0 files changed, 0 insertions, 0 deletions