[FFmpeg-cvslog] jpeg2000: Do not warn about known and skippable markers

Luca Barbato git at videolan.org
Sat Sep 12 13:22:10 CEST 2015


ffmpeg | branch: master | Luca Barbato <lu_zero at gentoo.org> | Fri Sep 11 03:00:36 2015 +0200| [db53a2306f62f05faa67e6f3c60ee55a9b8e4776] | committer: Luca Barbato

jpeg2000: Do not warn about known and skippable markers

Matches the openjpeg behaviour.

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=db53a2306f62f05faa67e6f3c60ee55a9b8e4776
---

 libavcodec/jpeg2000dec.c |    4 ++++
 1 file changed, 4 insertions(+)

diff --git a/libavcodec/jpeg2000dec.c b/libavcodec/jpeg2000dec.c
index 6946975..f5d5daf 100644
--- a/libavcodec/jpeg2000dec.c
+++ b/libavcodec/jpeg2000dec.c
@@ -1290,6 +1290,10 @@ static int jpeg2000_read_main_headers(Jpeg2000DecoderContext *s)
                 properties = s->tile[s->curtileno].properties;
             }
             break;
+        case JPEG2000_PLT:
+            // the PLT marker is ignored
+        case JPEG2000_PLM:
+            // the PLM marker is ignored
         case JPEG2000_COM:
             // the comment is ignored
             bytestream2_skip(&s->g, len - 2);



More information about the ffmpeg-cvslog mailing list