[FFmpeg-devel] [PATCH] flvdec: actually accept new extradata.

[Michael Niedermayer]

On Sun, Jan 29, 2012 at 05:21:04PM +0100, Nicolas George wrote:
> This test should have been removed when the following commit was merged:
> 251f320 flvdec: Export new AAC/H.264 extradata as side data on the next packet
> 
> Signed-off-by: Nicolas George <nicolas.george at normalesup.org>
> ---
>  libavformat/flvdec.c |    2 +-
>  1 files changed, 1 insertions(+), 1 deletions(-)
> 
>

> The current code is clearly wrong:
> 
> 	if (!foo) {
> 	    if (foo) {

yes, but please see: (it was quite intentionally disabled because it
broke various things and fixed none)

commit 8ff4fff7741a2febfd52be80cee4aadba9f9d760
Author: Michael Niedermayer <michaelni at gmx.at>
Date:   Fri Dec 23 19:52:15 2011 +0100

    flvdec: disable new midstream param change code not only for h264 but all cases.
    It breaks some samples and iam not aware of one that it fixes.

    Signed-off-by: Michael Niedermayer <michaelni at gmx.at>

diff --git a/libavformat/flvdec.c b/libavformat/flvdec.c
index 765eee5..57ef061 100644
--- a/libavformat/flvdec.c
+++ b/libavformat/flvdec.c
@@ -581,7 +581,7 @@ static int flv_read_packet(AVFormatContext *s, AVPacket *pkt)
             if (flv->wrong_dts)
                 dts = AV_NOPTS_VALUE;
         }
-        if (type == 0 && (!st->codec->extradata || st->codec->codec_id != CODEC_ID_H264)) {
+        if (type == 0 && !st->codec->extradata) {
             if (st->codec->extradata) {
                 if ((ret = flv_queue_extradata(flv, s->pb, stream_type, size)) < 0)
                     return ret;

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

The real ebay dictionary, page 3
"Rare item" - "Common item with rare defect or maybe just a lie"
"Professional" - "'Toy' made in china, not functional except as doorstop"
"Experts will know" - "The seller hopes you are not an expert"
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 198 bytes
Desc: Digital signature
URL: <http://ffmpeg.org/pipermail/ffmpeg-devel/attachments/20120129/2cf2e2e2/attachment.asc>