diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-01-27 16:47:50 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-01-27 16:47:56 +0100 |
| commit | 2b14344ab36efca915475a91feb744f8f4101cd5 (patch) | |
| tree | 4756159c406422ab206a00924401bc0636f07c11 /libavcodec/aac_parser.c | |
| parent | f5c0b9aa6f3843d33961981aa16317d05d74e9dc (diff) | |
| parent | 2026eb1408a718c37835eb4b258c63714ab3205e (diff) | |
| download | ffmpeg-2b14344ab36efca915475a91feb744f8f4101cd5.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
arm: vp8: Fix the plain-armv6 version of vp8_luma_dc_wht
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/aac_parser.c')
0 files changed, 0 insertions, 0 deletions