Re: r22112 - trunk/libavcodec/h264.c

On Sun, Feb 28, 2010 at 07:33:33PM +0100, 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).
> 
> Patch by Janusz Krzysztofik, jkrzyszt A tis D icnet D pl

This totally broke playback of
http://samples.mplayerhq.hu/V-codecs/h264/cathedral-beta2-400extra-crop-avc.mp4

Aurel

Re: r22112 - trunk/libavcodec/h264.c

On Mon, Mar 01, 2010 at 01:03:02AM +0100, Aurelien Jacobs wrote:
> On Sun, Feb 28, 2010 at 07:33:33PM +0100, 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).
> > 
> > Patch by Janusz Krzysztofik, jkrzyszt A tis D icnet D pl
> 
> This totally broke playback of
> http://samples.mplayerhq.hu/V-codecs/h264/cathedral-beta2-400extra-crop-avc.mp4

then revert it

[...]

--

-- 
Michael     GnuPG fingerprint: 9FF2128B147EF6730BADF133611EC787040B0FAB

Many that live deserve death. And some that die deserve life. Can you give
it to them? Then do not be too eager to deal out death in judgement. For
even the very wise cannot see all ends. -- Gandalf

_______________________________________________
ffmpeg-cvslog mailing list

r22125 - trunk/libavcodec/h264.c

Author: aurel
Date: Mon Mar  1 01:22:43 2010
New Revision: 22125

Log:
revert r22112 which broke playback of cathedral-beta2-400extra-crop-avc.mp4

Modified:
   trunk/libavcodec/h264.c

Modified: trunk/libavcodec/h264.c
==============================================================================
--- trunk/libavcodec/h264.c	Mon Mar  1 00:54:24 2010	(r22124)
+++ trunk/libavcodec/h264.c	Mon Mar  1 01:22:43 2010	(r22125)
 <at>  <at>  -1775,9 +1775,7  <at>  <at>  static int decode_slice_header(H264Conte
         s->height= 16*s->mb_height - 4*FFMIN(h->sps.crop_bottom, 3);

     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)) {
+        && (   s->width != s->avctx->width || s->height != s->avctx->height)) {
         if(h != h0)
             return -1;   // width / height changed during parallelized decoding
         free_tables(h);

Re: r22119 - in trunk/libavutil: tree.c tree.h

On Sun, Feb 28, 2010 at 09:48:42PM +0100, vitor wrote:
> Author: vitor
> Date: Sun Feb 28 21:48:42 2010
> New Revision: 22119
> 
> Log:
> Implement av_tree_destroy_free_elem() to destroy a tree and free all the 
> values stored on it.
> 
> Modified:
>    trunk/libavutil/tree.c
>    trunk/libavutil/tree.h
> 
> Modified: trunk/libavutil/tree.c
> ==============================================================================
> --- trunk/libavutil/tree.c	Sun Feb 28 20:58:26 2010	(r22118)
> +++ trunk/libavutil/tree.c	Sun Feb 28 21:48:42 2010	(r22119)
>  <at>  <at>  -135,6 +135,15  <at>  <at>  void av_tree_destroy(AVTreeNode *t){
>      }
>  }
>  
> +void av_tree_destroy_free_elem(AVTreeNode *t){
> +    if(t){
> +        av_tree_destroy_free_elem(t->child[0]);
> +        av_tree_destroy_free_elem(t->child[1]);
> +        av_free(t->elem);
> +        av_free(t);
> +    }
> +}
> +

Re: r22112 - trunk/libavcodec/h264.c

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)
>  <at>  <at>  -1777,7 +1777,7  <at>  <at> 
>      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)) {

Re: r22112 - trunk/libavcodec/h264.c

Andreas Öman <andreas <at> lonelycoder.com> writes:

> 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
> Index: libavcodec/h264.c
> ===================================================================
> --- libavcodec/h264.c	(revision 22118)
> +++ libavcodec/h264.c	(working copy)
>  <at>  <at>  -1777,7 +1777,7  <at>  <at> 
>      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)) {

Not C.

--

-- 

r22126 - trunk/ffmpeg.c

Author: benoit
Date: Mon Mar  1 08:22:59 2010
New Revision: 22126

Log:
ffmpeg: copy stream metadata.
Patch by Anton Khirnov wyskasgmailcom

Modified:
   trunk/ffmpeg.c

Modified: trunk/ffmpeg.c
==============================================================================
--- trunk/ffmpeg.c	Mon Mar  1 01:22:43 2010	(r22125)
+++ trunk/ffmpeg.c	Mon Mar  1 08:22:59 2010	(r22126)
 <at>  <at>  -1837,7 +1837,7  <at>  <at>  static int av_encode(AVFormatContext **o

     /* for each output stream, we compute the right encoding parameters */
     for(i=0;i<nb_ostreams;i++) {
-        AVMetadataTag *lang;
+        AVMetadataTag *t = NULL, *lang = NULL;
         ost = ost_table[i];
         os = output_files[ost->file_index];
         ist = ist_table[ost->source_index];
 <at>  <at>  -1845,9 +1845,13  <at>  <at>  static int av_encode(AVFormatContext **o
         codec = ost->st->codec;
         icodec = ist->st->codec;

-        if ((lang=av_metadata_get(ist->st->metadata, "language", NULL, 0))
-            &&   !av_metadata_get(ost->st->metadata, "language", NULL, 0))

Re: r22107 - trunk/libavformat/rtpproto.c

Carl Eugen Hoyos wrote:
> Luca Abeni <lucabe72 <at> email.it> writes:
> 
>>> While this obviously fixes the warning, I think it points out a problem:
>>> including a demuxer-related file (rtpdec.h) in a protocol-related file
>>> does not look correct to me.
> 
> I do not disagree, do you want me to revert?

Well, I replied just to make sure that the problem is not overlooked
and we keep track of it... Before reverting, let's see other people's
opinions.

Anyway, I'll post a patch to remove rtp_get_file_handles(), later.

			Thanks,
				Luca

r22127 - trunk/libavformat/nutdec.c

Author: benoit
Date: Mon Mar  1 08:26:41 2010
New Revision: 22127

Log:
nutdec: make chapter start and length uint64_t to prevent overflows.
Patch by Anton Khirnov wyskas chez gmail punto com

Modified:
   trunk/libavformat/nutdec.c

Modified: trunk/libavformat/nutdec.c
==============================================================================
--- trunk/libavformat/nutdec.c	Mon Mar  1 08:22:59 2010	(r22126)
+++ trunk/libavformat/nutdec.c	Mon Mar  1 08:26:41 2010	(r22127)
 <at>  <at>  -389,8 +389,8  <at>  <at>  static void set_disposition_bits(AVForma
 static int decode_info_header(NUTContext *nut){
     AVFormatContext *s= nut->avf;
     ByteIOContext *bc = s->pb;
-    uint64_t tmp;
-    unsigned int stream_id_plus1, chapter_start, chapter_len, count;
+    uint64_t tmp, chapter_start, chapter_len;
+    unsigned int stream_id_plus1, count;
     int chapter_id, i;
     int64_t value, end;
     char name[256], str_value[1024], type_str[256];

[ffmpeg.org]: r427 - trunk/src/index

Author: diego
Date: Mon Mar  1 12:59:12 2010
New Revision: 427

Log:
Add a short update about recent development activity.

Modified:
   trunk/src/index

Modified: trunk/src/index
==============================================================================
--- trunk/src/index	Wed Feb 24 05:40:17 2010	(r426)
+++ trunk/src/index	Mon Mar  1 12:59:12 2010	(r427)
 <at>  <at>  -38,6 +38,15  <at>  <at> 

 <h1>News</h1>

+<h3>March 1, 2010</h3>
+<p>
+We have been busy over the past few months. Among other things, the
+results are an Indeo 5 video decoder as well as audio decoders for
+AMR-NB, Sipro, MPEG-4 ALS and WMA Voice, complete support for Bink,
+CDG and IFF PBM/ILBM bitmaps, an RTSP muxer, Bluray (PGS) subtitle
+support, a protocol for file concatenation and the ffprobe tool for
+extracting information from multimedia files.
+</p>

 <h3>September 23, 2009</h3>
 <p>