Merge remote-tracking branch 'qatar/master'

* qatar/master: h264dec: Add .avc file name extension Merged-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago · d0171eb8d7
parent de493809f3 944c338430
commit d0171eb8d7
1 changed files with 1 additions and 1 deletions
--- a/libavformat/h264dec.c
+++ b/libavformat/h264dec.c
@ -75,4 +75,4 @@ static int h264_probe(AVProbeData *p)
    return 0;
 }

-FF_DEF_RAWVIDEO_DEMUXER(h264, "raw H.264 video", h264_probe, "h26l,h264,264", AV_CODEC_ID_H264)
+FF_DEF_RAWVIDEO_DEMUXER(h264, "raw H.264 video", h264_probe, "h26l,h264,264,avc", AV_CODEC_ID_H264)