diff options
| author | Carl Eugen Hoyos <cehoyos@rainbow.studorg.tuwien.ac.at> | 2009-06-20 14:47:38 +0000 |
|---|---|---|
| committer | Carl Eugen Hoyos <cehoyos@rainbow.studorg.tuwien.ac.at> | 2009-06-20 14:47:38 +0000 |
| commit | df028e8c6af3516b7347b093c7240c6bb6391ddc (patch) | |
| tree | 3c725b26f1a73bad877fc1fd0b181e988f759023 | |
| parent | 630c97ff4b81e5c631c33f1d803d69531f781fb3 (diff) | |
| download | ffmpeg-df028e8c6af3516b7347b093c7240c6bb6391ddc.tar.gz | |
Revert r19239: It broke four conformance tests.
Originally committed as revision 19241 to svn://svn.ffmpeg.org/ffmpeg/trunk
| -rw-r--r-- | libavcodec/h264.c | 6 | ||||
| -rw-r--r-- | libavformat/img2.c | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/libavcodec/h264.c b/libavcodec/h264.c index 23d5b10390..55553ed313 100644 --- 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 ec32f863e8..88c74246e4 100644 --- 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"}, |