diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-12-21 02:43:44 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-12-21 02:43:44 +0100 |
| commit | 50ff83e3afa75535bea839873f3e4c2356a979f6 (patch) | |
| tree | 31478978aec0d464a3938f528b62d6f79bf98bcc /doc/faq.texi | |
| parent | 2d7f139155dd734860d0731d095db1db9e9550fd (diff) | |
| parent | bdb975ab699a4374e928bc12f1653d079667d84a (diff) | |
| download | ffmpeg-50ff83e3afa75535bea839873f3e4c2356a979f6.tar.gz | |
Merge remote-tracking branch 'qatar/release/9' into release/1.1
* qatar/release/9:
arm: Don't clobber callee saved registers in scalarproduct
alsdec: check block length
h264/mpegvideo: do not provide pixel formats for hwaccels that are not compiled in
mpeg4video_parser: init mpeg4 static tables.
Conflicts:
libavcodec/mpeg4video_parser.c
libavcodec/mpeg4videodec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'doc/faq.texi')
0 files changed, 0 insertions, 0 deletions