diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2013-09-21 11:57:06 +0200 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2013-09-21 11:57:19 +0200 |
commit | d0171eb8d7955b7d99debc22f2a0db0600349e89 (patch) | |
tree | 2f4eacfc41e82cf5bba0088fea11344f9a380224 /COPYING.GPLv3 | |
parent | de493809f31a91a57e37c570b538e47647d51b29 (diff) | |
parent | 944c3384305ef52ddabcfce2a7644524f8fe2416 (diff) | |
download | ffmpeg-d0171eb8d7955b7d99debc22f2a0db0600349e89.tar.gz |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
h264dec: Add .avc file name extension
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'COPYING.GPLv3')
0 files changed, 0 insertions, 0 deletions