diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-06-09 22:30:17 +0400 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-06-09 22:30:17 +0400 |
| commit | 75f8f702217fdeae9e2868c7ba80c03f9ec0958a (patch) | |
| tree | f18ccb504b4ea2d45407fc35a9cb8f8efb869bb6 /libavcodec/h264.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 'libavcodec/h264.c')
| -rw-r--r-- | libavcodec/h264.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/libavcodec/h264.c b/libavcodec/h264.c index 22f5527f6f..e0d62e3b00 100644 --- a/libavcodec/h264.c +++ b/libavcodec/h264.c @@ -2969,7 +2969,6 @@ static int decode_slice_header(H264Context *h, H264Context *h0) s->width = 16 * s->mb_width; s->height = 16 * s->mb_height; - if(must_reinit) { free_tables(h, 0); flush_dpb(s->avctx); |