Merge remote-tracking branch 'qatar/master'
authorMichael Niedermayer <michaelni@gmx.at>
Sat, 21 Sep 2013 09:57:06 +0000 (11:57 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Sat, 21 Sep 2013 09:57:19 +0000 (11:57 +0200)
commitd0171eb8d7955b7d99debc22f2a0db0600349e89
tree2f4eacfc41e82cf5bba0088fea11344f9a380224
parentde493809f31a91a57e37c570b538e47647d51b29
parent944c3384305ef52ddabcfce2a7644524f8fe2416
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  h264dec: Add .avc file name extension

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavformat/h264dec.c