Merge remote-tracking branch 'qatar/master'

* qatar/master: h264dec: Add .avc file name extension Merged-by: Michael Niedermayer <michaelni@gmx.at>

Merge remote-tracking branch 'qatar/master'
* qatar/master: h264dec: Add .avc file name extension Merged-by: Michael Niedermayer <michaelni@gmx.at>
d0171eb8 · Michael Niedermayer · de493809 · 944c3384 · d0171eb8
Commit d0171eb8 authored Sep 21, 2013 by Michael Niedermayer
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

h264dec.c libavformat/h264dec.c +1 -1

No files found.
--- 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)