Revert r19239: It broke four conformance tests.

git-svn-id: file:///var/local/repositories/ffmpeg/trunk@19241 9553f0bf-9b14-0410-a0b8-cfaf0461ba5b

diff --git a/libavcodec/h264.c b/libavcodec/h264.c
index 23d5b10390d36d11e89b625c6c2d3954dbcbceaa..55553ed31338e7fbd65b9881b136a80d28dadf21 100644 (file)
--- a/libavcodec/h264.c
+++ b/libavcodec/h264.c
@@ -7708,7 +7708,7 @@ static int decode_frame(AVCodecContext *avctx,
 //FIXME factorize this with the output code below
         out = h->delayed_pic[0];
         out_idx = 0;
-        for(i=1; h->delayed_pic[i] && !h->delayed_pic[i]->key_frame; i++)
+        for(i=1; h->delayed_pic[i] && (h->delayed_pic[i]->poc && !h->delayed_pic[i]->key_frame); i++)
             if(h->delayed_pic[i]->poc < out->poc){
                 out = h->delayed_pic[i];
                 out_idx = i;
@@ -7884,12 +7884,12 @@ static int decode_frame(AVCodecContext *avctx,
 
             out = h->delayed_pic[0];
             out_idx = 0;
-            for(i=1; h->delayed_pic[i] && !h->delayed_pic[i]->key_frame; i++)
+            for(i=1; h->delayed_pic[i] && (h->delayed_pic[i]->poc && !h->delayed_pic[i]->key_frame); i++)
                 if(h->delayed_pic[i]->poc < out->poc){
                     out = h->delayed_pic[i];
                     out_idx = i;
                 }
-            cross_idr = !!h->delayed_pic[i] || h->delayed_pic[0]->key_frame;
+            cross_idr = !h->delayed_pic[0]->poc || !!h->delayed_pic[i] || h->delayed_pic[0]->key_frame;
 
             out_of_order = !cross_idr && out->poc < h->outputed_poc;
 

diff --git a/libavformat/img2.c b/libavformat/img2.c
index ec32f863e8d2c48833061b6750de6e48be12bbe8..88c74246e439bac58aef59a278e7ec9204e71e8f 100644 (file)
--- a/libavformat/img2.c
+++ b/libavformat/img2.c
@@ -42,7 +42,7 @@ typedef struct {
 static const IdStrMap img_tags[] = {
     { CODEC_ID_MJPEG     , "jpeg"},
     { CODEC_ID_MJPEG     , "jpg"},
-    { CODEC_ID_LJPEG     , "ljpg"},
+    { CODEC_ID_JPEGLS    , "ljpg"},
     { CODEC_ID_PNG       , "png"},
     { CODEC_ID_PNG       , "mng"},
     { CODEC_ID_PPM       , "ppm"},