From: Michael Niedermayer <michaelni@gmx.at>
Date: Wed, 3 Jul 2013 14:22:11 +0000 (+0200)
Subject: Merge commit 'd57c737ac30cf079a342fa649fd4888c2d059dd9'
X-Git-Tag: n2.0~137
X-Git-Url: http://git.ffmpeg.org/gitweb/ffmpeg.git/commitdiff_plain/19ff6f55e800d848920af4a10e9516e51bfdcb0f

Merge commit 'd57c737ac30cf079a342fa649fd4888c2d059dd9'

* commit 'd57c737ac30cf079a342fa649fd4888c2d059dd9':
  jpeg2000: Simplify jpeg2000_decode_packets()
  jpeg2000: Do not crash on NULL node in tag_tree_decode
  jpeg2000: Refactor SOT marker parsing

Conflicts:
	libavcodec/jpeg2000dec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
---

19ff6f55e800d848920af4a10e9516e51bfdcb0f
diff --cc libavcodec/jpeg2000dec.c
index 7b8a9aa,6e78083..0371773
--- a/libavcodec/jpeg2000dec.c
+++ b/libavcodec/jpeg2000dec.c
@@@ -725,8 -728,7 +726,10 @@@ static int jpeg2000_decode_packets(Jpeg
  
      s->bit_index = 8;
      switch (tile->codsty[0].prog_order) {
-     case JPEG2000_PGOD_LRCP:
 +    case JPEG2000_PGOD_RLCP:
++        avpriv_request_sample(s->avctx, "Progression order RLCP");
++
+     case JPEG2000_PGOD_LRCP:
          for (layno = 0; layno < tile->codsty[0].nlayers; layno++) {
              ok_reslevel = 1;
              for (reslevelno = 0; ok_reslevel; reslevelno++) {
@@@ -799,6 -801,21 +802,16 @@@
          }
          break;
  
 -    case JPEG2000_PGOD_RLCP:
 -        avpriv_request_sample(s->avctx, "Progression order RLCP");
 -        ret = AVERROR_PATCHWELCOME;
 -        break;
 -
+     case JPEG2000_PGOD_RPCL:
+         avpriv_request_sample(s->avctx, "Progression order RPCL");
+         ret = AVERROR_PATCHWELCOME;
+         break;
+ 
+     case JPEG2000_PGOD_PCRL:
+         avpriv_request_sample(s->avctx, "Progression order PCRL");
+         ret = AVERROR_PATCHWELCOME;
+         break;
+ 
      default:
          break;
      }