[FFmpeg-cvslog] r22112 - trunk/libavcodec/h264.c

[Michael Niedermayer]

On Sun, Feb 28, 2010 at 10:07:31PM +0100, Andreas ?man wrote:
> cehoyos wrote:
>> Author: cehoyos
>> Date: Sun Feb 28 19:33:33 2010
>> New Revision: 22112
>> Log:
>> Process picture aspect ratio changes in H.264.
>> This fixes playback of such streams with ffplay (but does not affect
>> current ffmpeg).
>
> This breaks when the workaround for a denominator == 0 kicks in (about
> 15 lines down). I see it with an x264 encoded file (dunno what version
> of x264 though)
>
> Patch attached

>  h264.c |    2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 12168d6b495dbe1736998888b15dd03ec40461ba  h264.diff
> Index: libavcodec/h264.c
> ===================================================================
> --- libavcodec/h264.c	(revision 22118)
> +++ libavcodec/h264.c	(working copy)
> @@ -1777,7 +1777,7 @@
>      if (s->context_initialized
>          && (   s->width != s->avctx->width || s->height != s->avctx->height
>                  || h->sps.sar.num != s->avctx->sample_aspect_ratio.num
> -                || h->sps.sar.den != s->avctx->sample_aspect_ratio.den)) {
> +                || (h->sps.sar.den?:1) != s->avctx->sample_aspect_ratio.den)) {

does av_cmp_q() work too?
if so feel free to commit that

[...]
-- 
Michael     GnuPG fingerprint: 9FF2128B147EF6730BADF133611EC787040B0FAB

I have often repented speaking, but never of holding my tongue.
-- Xenocrates
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 189 bytes
Desc: Digital signature
URL: <http://lists.mplayerhq.hu/pipermail/ffmpeg-cvslog/attachments/20100301/27c1ad08/attachment.pgp>