diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-06-09 20:30:17 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-06-09 20:30:17 +0200 |
| commit | 75f8f702217fdeae9e2868c7ba80c03f9ec0958a (patch) | |
| tree | f18ccb504b4ea2d45407fc35a9cb8f8efb869bb6 /libavformat/mov.c | |
| parent | 8554e21f79a88844c7b192b029c9f6257f8b66f1 (diff) | |
| parent | 30f515091c323da59c0f1b533703dedca2f4b95d (diff) | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
h264: allow cropping to AVCodecContext.width/height
mov: set AVCodecContext.width/height for h264
iac: generate codec tables as they are supposed to be
indeo4: handle frame type 1 properly
lavu: change versioning script to include all av* prefixed symbols
Conflicts:
libavcodec/h264.c
libavutil/libavutil.v
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/mov.c')
| -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 a7bb0762c2..97564136c5 100644 --- a/libavformat/mov.c +++ b/libavformat/mov.c @@ -2163,9 +2163,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 |