diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-01-19 13:34:41 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-01-19 13:34:41 +0100 |
| commit | 56cc629a645e479c233750a60a35264b4aa9a651 (patch) | |
| tree | a4a420cfbbbe97ab5ce913e62e64b10a290cd440 /libavcodec/h264.c | |
| parent | 685321e4bd84fbe595cebc78cb92619e7df05a61 (diff) | |
| download | ffmpeg-56cc629a645e479c233750a60a35264b4aa9a651.tar.gz | |
Revert "h264: allow cropping to AVCodecContext.width/height"
This reverts commit a2ae183a382f063c5403922b5151d865ce7252a2.
This removes a duplicate hunk
Found-by: Joakim Plate <elupus@ecce.se>
Diffstat (limited to 'libavcodec/h264.c')
| -rw-r--r-- | libavcodec/h264.c | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/libavcodec/h264.c b/libavcodec/h264.c index 8c7ebcab55..97b46fdcd7 100644 --- a/libavcodec/h264.c +++ b/libavcodec/h264.c @@ -2623,12 +2623,6 @@ static int decode_slice_header(H264Context *h, H264Context *h0){ s->height = s->avctx->height; } - if (FFALIGN(s->avctx->width, 16) == s->width && - FFALIGN(s->avctx->height, 16) == s->height) { - s->width = s->avctx->width; - s->height = s->avctx->height; - } - if (s->context_initialized && ( s->width != s->avctx->width || s->height != s->avctx->height || av_cmp_q(h->sps.sar, s->avctx->sample_aspect_ratio))) { |