[FFmpeg-cvslog] Revert "h264: allow cropping to AVCodecContext.width/height"
Michael Niedermayer
git at videolan.org
Mon Feb 18 01:09:53 CET 2013
ffmpeg | branch: release/0.7 | Michael Niedermayer <michaelni at gmx.at> | Sat Jan 19 13:34:41 2013 +0100| [56cc629a645e479c233750a60a35264b4aa9a651] | committer: Michael Niedermayer
Revert "h264: allow cropping to AVCodecContext.width/height"
This reverts commit a2ae183a382f063c5403922b5151d865ce7252a2.
This removes a duplicate hunk
Found-by: Joakim Plate <elupus at ecce.se>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=56cc629a645e479c233750a60a35264b4aa9a651
---
libavcodec/h264.c | 6 ------
1 file changed, 6 deletions(-)
diff --git a/libavcodec/h264.c b/libavcodec/h264.c
index 8c7ebca..97b46fd 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))) {
More information about the ffmpeg-cvslog
mailing list