diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-09-19 00:27:03 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-09-19 00:54:30 +0200 |
| commit | 7f90fe1b4b8ba6ac007094983f88668f6319ee50 (patch) | |
| tree | 86bf78b9fc2dc375b3a1dbbc9f890b4f9187f7db | |
| parent | 2cf6afffe54f32ea76aabe758049b574b5a30dfd (diff) | |
| parent | 2fb4be9a99a2c2a9435339830e3d940171cc0d9b (diff) | |
| download | ffmpeg-7f90fe1b4b8ba6ac007094983f88668f6319ee50.tar.gz | |
Merge remote-tracking branch 'qatar/release/0.8' into release/0.10
Merged-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | libavformat/mov.c | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/libavformat/mov.c b/libavformat/mov.c index 59922d1123..0cc94e5944 100644 --- a/libavformat/mov.c +++ b/libavformat/mov.c @@ -2071,9 +2071,6 @@ static int mov_read_trak(MOVContext *c, AVIOContext *pb, MOVAtom atom) #if CONFIG_H263_DECODER case CODEC_ID_H263: #endif -#if CONFIG_H264_DECODER - case CODEC_ID_H264: -#endif #if CONFIG_MPEG4_DECODER case CODEC_ID_MPEG4: #endif |