diff options
| author | Carl Eugen Hoyos <cehoyos@ag.or.at> | 2015-10-14 16:40:57 +0200 |
|---|---|---|
| committer | Carl Eugen Hoyos <cehoyos@ag.or.at> | 2015-10-14 16:40:57 +0200 |
| commit | 1f2c474cb214b94a31b23967d334fea96dda62e5 (patch) | |
| tree | f2b73c0c6aa43a0f97f02aee22a52797696c8d18 /libavformat/rawdec.c | |
| parent | c793a271d567e961a3643513adc0463f5b97485b (diff) | |
| download | android_external_ffmpeg-1f2c474cb214b94a31b23967d334fea96dda62e5.tar.gz android_external_ffmpeg-1f2c474cb214b94a31b23967d334fea96dda62e5.tar.bz2 android_external_ffmpeg-1f2c474cb214b94a31b23967d334fea96dda62e5.zip | |
lavf/vc1dec: Autodetect raw vc-1 streams.
Move the demuxer into its own file.
Diffstat (limited to 'libavformat/rawdec.c')
| -rw-r--r-- | libavformat/rawdec.c | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/libavformat/rawdec.c b/libavformat/rawdec.c index 16fb221648..7098ebd402 100644 --- a/libavformat/rawdec.c +++ b/libavformat/rawdec.c @@ -205,7 +205,3 @@ static int mjpeg_probe(AVProbeData *p) FF_DEF_RAWVIDEO_DEMUXER2(mjpeg, "raw MJPEG video", mjpeg_probe, "mjpg,mjpeg,mpo", AV_CODEC_ID_MJPEG, AVFMT_GENERIC_INDEX|AVFMT_NOTIMESTAMPS) #endif - -#if CONFIG_VC1_DEMUXER -FF_DEF_RAWVIDEO_DEMUXER2(vc1, "raw VC-1", NULL, "vc1", AV_CODEC_ID_VC1, AVFMT_GENERIC_INDEX|AVFMT_NOTIMESTAMPS) -#endif |