Merge remote-tracking branch 'qatar/master'
authorMichael Niedermayer <michaelni@gmx.at>
Sat, 22 Mar 2014 22:44:28 +0000 (23:44 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Sat, 22 Mar 2014 22:44:28 +0000 (23:44 +0100)
* qatar/master:
  lagarith: Fix typo in printf format string

Conflicts:
libavcodec/lagarith.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
1  2 
libavcodec/lagarith.c

@@@ -713,8 -668,8 +713,8 @@@ static int lag_decode_frame(AVCodecCont
          break;
      default:
          av_log(avctx, AV_LOG_ERROR,
-                "Unsupported Lagarith frame type: %#"PRIu8"\n", frametype);
+                "Unsupported Lagarith frame type: %#"PRIx8"\n", frametype);
 -        return -1;
 +        return AVERROR_PATCHWELCOME;
      }
  
      *got_frame = 1;