Merge commit 'a5a0ef5e13a59ff53318a45d77c5624b23229c6f'

* commit 'a5a0ef5e13a59ff53318a45d77c5624b23229c6f':
  jpegls: return meaningful errors
  sparc: VIS mnemonics

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

diff --cc libavcodec/jpeglsdec.c
index b13f9ef,cec5612..40301d4
--- 1/libavcodec/jpeglsdec.c
--- 2/libavcodec/jpeglsdec.c
+++ b/libavcodec/jpeglsdec.c
@@@ -349,14 -343,13 +349,13 @@@ int ff_jpegls_decode_picture(MJpegDecod
                  }
              }
              last = cur;
 -            cur += s->picture_ptr->linesize[0];
 +            cur += s->picture.linesize[0];
          }
      } else if (ilv == 2) { /* sample interleaving */
-         av_log(s->avctx, AV_LOG_ERROR,
-                "Sample interleaved images are not supported.\n");
+         avpriv_report_missing_feature(s->avctx, "Sample interleaved images");
          av_free(state);
          av_free(zero);
-         return -1;
+         return AVERROR_PATCHWELCOME;
      }
  
      if (shift) { /* we need to do point transform or normalize samples */

diff --cc libavcodec/sparc/vis.h
Simple merge