mirror of
https://github.com/FFmpeg/FFmpeg.git
synced 2024-12-23 12:43:46 +02:00
Merge remote-tracking branch 'qatar/master'
* qatar/master: h264dec: Add .avc file name extension Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
commit
d0171eb8d7
@ -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)
|
||||
|
Loading…
Reference in New Issue
Block a user