Merge remote-tracking branch 'qatar/master'

* qatar/master:
  dirac: use meaningful return values
  flacdec: simplify sample buffer handling
  flacdec: simplify loop in decode_residuals()
  fate: make Ut Video encoder tests use bitexact swscale flags
  build: amrwb: Drop redundant lsp dependency declaration
  fate: fix utvideoenc tests

Conflicts:
	libavcodec/dirac.c

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

diff --cc libavcodec/Makefile
index 566b709,f8b67b8..0e9de98
--- 1/libavcodec/Makefile
--- 2/libavcodec/Makefile
+++ b/libavcodec/Makefile
@@@ -93,12 -89,8 +93,12 @@@ OBJS-$(CONFIG_AMRNB_DECODER)           
  OBJS-$(CONFIG_AMRWB_DECODER)           += amrwbdec.o celp_filters.o   \
                                            celp_math.o acelp_filters.o \
                                            acelp_vectors.o             \
-                                           acelp_pitch_delay.o lsp.o
+                                           acelp_pitch_delay.o
  OBJS-$(CONFIG_AMV_DECODER)             += sp5xdec.o mjpegdec.o mjpeg.o
 +OBJS-$(CONFIG_AMV_ENCODER)             += mjpegenc.o mjpeg.o           \
 +                                          mpegvideo_enc.o motion_est.o \
 +                                          ratecontrol.o mpeg12data.o   \
 +                                          mpegvideo.o
  OBJS-$(CONFIG_ANM_DECODER)             += anm.o
  OBJS-$(CONFIG_ANSI_DECODER)            += ansi.o cga_data.o
  OBJS-$(CONFIG_APE_DECODER)             += apedec.o

diff --cc libavcodec/dirac.c
index 57074bc,3b5d177..3aa65e3
--- 1/libavcodec/dirac.c
--- 2/libavcodec/dirac.c
+++ b/libavcodec/dirac.c
@@@ -131,82 -112,77 +131,82 @@@ static int parse_source_parameters(AVCo
      unsigned luma_depth = 8, luma_offset = 16;
      int idx;
  
 -    if (get_bits1(gb)) {
 -        source->width  = svq3_get_ue_golomb(gb);
 -        source->height = svq3_get_ue_golomb(gb);
 +    /* [DIRAC_STD] 10.3.2 Frame size. frame_size(video_params) */
 +    if (get_bits1(gb)) {                         /* [DIRAC_STD] custom_dimensions_flag */
 +        source->width  = svq3_get_ue_golomb(gb); /* [DIRAC_STD] FRAME_WIDTH            */
 +        source->height = svq3_get_ue_golomb(gb); /* [DIRAC_STD] FRAME_HEIGHT           */
      }
  
 -    // chroma subsampling
 -    if (get_bits1(gb))
 -        source->chroma_format = svq3_get_ue_golomb(gb);
 -    if (source->chroma_format > 2) {
 +    /* [DIRAC_STD] 10.3.3 Chroma Sampling Format.
 +       chroma_sampling_format(video_params) */
 +    if (get_bits1(gb))                                  /* [DIRAC_STD] custom_chroma_format_flag */
 +        source->chroma_format = svq3_get_ue_golomb(gb); /*[DIRAC_STD] CHROMA_FORMAT_INDEX        */
 +    if (source->chroma_format > 2U) {
          av_log(avctx, AV_LOG_ERROR, "Unknown chroma format %d\n",
                 source->chroma_format);
-         return -1;
+         return AVERROR_INVALIDDATA;
      }
  
 -    if (get_bits1(gb))
 -        source->interlaced = svq3_get_ue_golomb(gb);
 -    if (source->interlaced > 1)
 +    /* [DIRAC_STD] 10.3.4 Scan Format. scan_format(video_params) */
 +    if (get_bits1(gb))                               /* [DIRAC_STD] custom_scan_format_flag */
 +        source->interlaced = svq3_get_ue_golomb(gb); /* [DIRAC_STD] SOURCE_SAMPLING         */
 +    if (source->interlaced > 1U)
-         return -1;
+         return AVERROR_INVALIDDATA;
  
 -    // frame rate
 -    if (get_bits1(gb)) {
 +    /* [DIRAC_STD] 10.3.5 Frame Rate. frame_rate(video_params) */
 +    if (get_bits1(gb)) { /* [DIRAC_STD] custom_frame_rate_flag */
          source->frame_rate_index = svq3_get_ue_golomb(gb);
  
 -        if (source->frame_rate_index > 10)
 +        if (source->frame_rate_index > 10U)
-             return -1;
+             return AVERROR_INVALIDDATA;
  
 -        if (!source->frame_rate_index) {
 -            frame_rate.num = svq3_get_ue_golomb(gb);
 -            frame_rate.den = svq3_get_ue_golomb(gb);
 +        if (!source->frame_rate_index){
 +            frame_rate.num = svq3_get_ue_golomb(gb); /* [DIRAC_STD] FRAME_RATE_NUMER */
 +            frame_rate.den = svq3_get_ue_golomb(gb); /* [DIRAC_STD] FRAME_RATE_DENOM */
          }
      }
 -    if (source->frame_rate_index > 0) {
 +    if (source->frame_rate_index > 0) { /* [DIRAC_STD] preset_frame_rate(video_params,index) */
          if (source->frame_rate_index <= 8)
 -            frame_rate = avpriv_frame_rate_tab[source->frame_rate_index];
 +            frame_rate = avpriv_frame_rate_tab[source->frame_rate_index];  /* [DIRAC_STD] Table 10.3 values 1-8  */
          else
 -            frame_rate = dirac_frame_rate[source->frame_rate_index-9];
 +            frame_rate = dirac_frame_rate[source->frame_rate_index-9]; /* [DIRAC_STD] Table 10.3 values 9-10 */
      }
      av_reduce(&avctx->time_base.num, &avctx->time_base.den,
                frame_rate.den, frame_rate.num, 1<<30);
  
 -    // aspect ratio
 -    if (get_bits1(gb)) {
 -        source->aspect_ratio_index = svq3_get_ue_golomb(gb);
 +    /* [DIRAC_STD] 10.3.6 Pixel Aspect Ratio. pixel_aspect_ratio(video_params) */
 +    if (get_bits1(gb)) { /* [DIRAC_STD] custom_pixel_aspect_ratio_flag */
 +        source->aspect_ratio_index = svq3_get_ue_golomb(gb); /* [DIRAC_STD] index */
  
 -        if (source->aspect_ratio_index > 6)
 +        if (source->aspect_ratio_index > 6U)
-             return -1;
+             return AVERROR_INVALIDDATA;
  
          if (!source->aspect_ratio_index) {
              avctx->sample_aspect_ratio.num = svq3_get_ue_golomb(gb);
              avctx->sample_aspect_ratio.den = svq3_get_ue_golomb(gb);
          }
      }
 -    if (source->aspect_ratio_index > 0)
 +    if (source->aspect_ratio_index > 0) /* [DIRAC_STD] Take value from Table 10.4 Available preset pixel aspect ratio values */
          avctx->sample_aspect_ratio =
 -                dirac_preset_aspect_ratios[source->aspect_ratio_index-1];
 -
 -    if (get_bits1(gb)) {
 -        source->clean_width        = svq3_get_ue_golomb(gb);
 -        source->clean_height       = svq3_get_ue_golomb(gb);
 -        source->clean_left_offset  = svq3_get_ue_golomb(gb);
 -        source->clean_right_offset = svq3_get_ue_golomb(gb);
 +            dirac_preset_aspect_ratios[source->aspect_ratio_index-1];
 +
 +    /* [DIRAC_STD] 10.3.7 Clean area. clean_area(video_params) */
 +    if (get_bits1(gb)) { /* [DIRAC_STD] custom_clean_area_flag */
 +        source->clean_width        = svq3_get_ue_golomb(gb); /* [DIRAC_STD] CLEAN_WIDTH        */
 +        source->clean_height       = svq3_get_ue_golomb(gb); /* [DIRAC_STD] CLEAN_HEIGHT       */
 +        source->clean_left_offset  = svq3_get_ue_golomb(gb); /* [DIRAC_STD] CLEAN_LEFT_OFFSET  */
 +        source->clean_right_offset = svq3_get_ue_golomb(gb); /* [DIRAC_STD] CLEAN_RIGHT_OFFSET */
      }
  
 -    // Override signal range.
 -    if (get_bits1(gb)) {
 -        source->pixel_range_index = svq3_get_ue_golomb(gb);
 +    /*[DIRAC_STD] 10.3.8 Signal range. signal_range(video_params)
 +      WARNING: Some adaptation seemed to be done using the AVCOL_RANGE_MPEG/JPEG values */
 +    if (get_bits1(gb)) {                                    /*[DIRAC_STD] custom_signal_range_flag */
 +        source->pixel_range_index = svq3_get_ue_golomb(gb); /*[DIRAC_STD] index */
  
 -        if (source->pixel_range_index > 4)
 +        if (source->pixel_range_index > 4U)
-             return -1;
+             return AVERROR_INVALIDDATA;
  
 -        // This assumes either fullrange or MPEG levels only
 +        /* This assumes either fullrange or MPEG levels only */
          if (!source->pixel_range_index) {
              luma_offset = svq3_get_ue_golomb(gb);
              luma_depth  = av_log2(svq3_get_ue_golomb(gb))+1;
@@@ -227,12 -203,12 +227,12 @@@
  
      avctx->pix_fmt = dirac_pix_fmt[!luma_offset][source->chroma_format];
  
 -    // color spec
 -    if (get_bits1(gb)) {
 -        idx = source->color_spec_index = svq3_get_ue_golomb(gb);
 +    /* [DIRAC_STD] 10.3.9 Colour specification. colour_spec(video_params) */
 +    if (get_bits1(gb)) { /* [DIRAC_STD] custom_colour_spec_flag */
 +        idx = source->color_spec_index = svq3_get_ue_golomb(gb); /* [DIRAC_STD] index */
  
 -        if (source->color_spec_index > 4)
 +        if (source->color_spec_index > 4U)
-             return -1;
+             return AVERROR_INVALIDDATA;
  
          avctx->color_primaries = dirac_color_presets[idx].color_primaries;
          avctx->colorspace      = dirac_color_presets[idx].colorspace;
@@@ -276,8 -247,8 +276,9 @@@ int avpriv_dirac_parse_sequence_header(
  {
      unsigned version_major;
      unsigned video_format, picture_coding_mode;
+     int ret;
  
 +    /* [DIRAC_SPEC] 10.1 Parse Parameters. parse_parameters() */
      version_major  = svq3_get_ue_golomb(gb);
      svq3_get_ue_golomb(gb); /* version_minor */
      avctx->profile = svq3_get_ue_golomb(gb);
@@@ -291,19 -260,18 +292,18 @@@
      else if (version_major > 2)
          av_log(avctx, AV_LOG_WARNING, "Stream may have unhandled features\n");
  
 -    if (video_format > 20)
 +    if (video_format > 20U)
-         return -1;
+         return AVERROR_INVALIDDATA;
  
 -    // Fill in defaults for the source parameters.
 +    /* Fill in defaults for the source parameters. */
      *source = dirac_source_parameters_defaults[video_format];
  
-     /*[DIRAC_STD] 10.3 Source Parameters
-       Override the defaults. */
-     if (parse_source_parameters(avctx, gb, source))
-         return -1;
+     // Override the defaults.
+     if (ret = parse_source_parameters(avctx, gb, source))
+         return ret;
  
-     if (av_image_check_size(source->width, source->height, 0, avctx))
-         return -1;
+     if (ret = av_image_check_size(source->width, source->height, 0, avctx))
+         return ret;
  
      avcodec_set_dimensions(avctx, source->width, source->height);
  

diff --cc libavcodec/flacdec.c
Simple merge