Merge remote-tracking branch 'qatar/master'

* qatar/master:
  avutil: Do not make ff_ symbols globally visible.
  avutil: Rename ff_set_systematic_pal2() ---> avpriv_set_systematic_pal2()
  build: tms470: work around glibc math.h problems
  configure: improve tms470 compiler usage with glibc

Conflicts:
	libavcodec/bmpenc.c
	libavcodec/rawdec.c

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

diff --cc configure
Simple merge

diff --cc libavcodec/bmpenc.c
index fc36028,d27282d..bda6799
--- 1/libavcodec/bmpenc.c
--- 2/libavcodec/bmpenc.c
+++ b/libavcodec/bmpenc.c
@@@ -98,10 -93,7 +98,10 @@@ static int bmp_encode_frame(AVCodecCont
      case AV_PIX_FMT_RGB4_BYTE:
      case AV_PIX_FMT_BGR4_BYTE:
      case AV_PIX_FMT_GRAY8:
 -        avpriv_set_systematic_pal2((uint32_t*)p->data[1], avctx->pix_fmt);
 +        av_assert1(bit_count == 8);
-         ff_set_systematic_pal2(palette256, avctx->pix_fmt);
++        avpriv_set_systematic_pal2(palette256, avctx->pix_fmt);
 +        pal = palette256;
 +        break;
      case AV_PIX_FMT_PAL8:
          pal = (uint32_t *)p->data[1];
          break;

diff --cc libavcodec/pcxenc.c
index 7f710a2,e0ee20a..7cb3af3
--- 1/libavcodec/pcxenc.c
--- 2/libavcodec/pcxenc.c
+++ b/libavcodec/pcxenc.c
@@@ -129,11 -127,6 +129,11 @@@ static int pcx_encode_frame(AVCodecCont
      case AV_PIX_FMT_RGB4_BYTE:
      case AV_PIX_FMT_BGR4_BYTE:
      case AV_PIX_FMT_GRAY8:
-         ff_set_systematic_pal2(palette256, avctx->pix_fmt);
 +        bpp = 8;
 +        nplanes = 1;
++        avpriv_set_systematic_pal2(palette256, avctx->pix_fmt);
 +        pal = palette256;
 +        break;
      case AV_PIX_FMT_PAL8:
          bpp = 8;
          nplanes = 1;

diff --cc libavcodec/rawdec.c
index d426f43,449755f..3496bb0
--- 1/libavcodec/rawdec.c
--- 2/libavcodec/rawdec.c
+++ b/libavcodec/rawdec.c
@@@ -94,21 -77,17 +94,21 @@@ static av_cold int raw_init_decoder(AVC
  {
      RawVideoContext *context = avctx->priv_data;
  
 -    if (avctx->codec_tag == MKTAG('r','a','w',' '))
 -        avctx->pix_fmt = find_pix_fmt(pix_fmt_bps_mov, avctx->bits_per_coded_sample);
 +    if (avctx->codec_tag == MKTAG('r','a','w',' ') || avctx->codec_tag == MKTAG('N','O','1','6'))
 +        avctx->pix_fmt = ff_find_pix_fmt(pix_fmt_bps_mov, avctx->bits_per_coded_sample);
      else if (avctx->codec_tag == MKTAG('W','R','A','W'))
 -        avctx->pix_fmt = find_pix_fmt(pix_fmt_bps_avi, avctx->bits_per_coded_sample);
 +        avctx->pix_fmt = ff_find_pix_fmt(pix_fmt_bps_avi, avctx->bits_per_coded_sample);
      else if (avctx->codec_tag)
 -        avctx->pix_fmt = find_pix_fmt(ff_raw_pix_fmt_tags, avctx->codec_tag);
 +        avctx->pix_fmt = ff_find_pix_fmt(ff_raw_pix_fmt_tags, avctx->codec_tag);
      else if (avctx->pix_fmt == AV_PIX_FMT_NONE && avctx->bits_per_coded_sample)
 -        avctx->pix_fmt = find_pix_fmt(pix_fmt_bps_avi, avctx->bits_per_coded_sample);
 +        avctx->pix_fmt = ff_find_pix_fmt(pix_fmt_bps_avi, avctx->bits_per_coded_sample);
 +
 +    if (avctx->pix_fmt == AV_PIX_FMT_NONE) {
 +        av_log(avctx, AV_LOG_ERROR, "Pixel format was not specified and cannot be detected\n");
 +        return AVERROR(EINVAL);
 +    }
  
-     ff_set_systematic_pal2(context->palette, avctx->pix_fmt);
+     avpriv_set_systematic_pal2(context->palette, avctx->pix_fmt);
 -    context->length = avpicture_get_size(avctx->pix_fmt, avctx->width, avctx->height);
      if((avctx->bits_per_coded_sample == 4 || avctx->bits_per_coded_sample == 2) &&
         avctx->pix_fmt==AV_PIX_FMT_PAL8 &&
         (!avctx->codec_tag || avctx->codec_tag == MKTAG('r','a','w',' '))){

diff --cc libavcodec/utils.c
Simple merge

diff --cc libavfilter/vf_scale.c
index bc7f20c,cbc1081..c42f9f2
--- 1/libavfilter/vf_scale.c
--- 2/libavfilter/vf_scale.c
+++ b/libavfilter/vf_scale.c
@@@ -319,12 -283,10 +319,12 @@@ static int start_frame(AVFilterLink *li
      outpicref->video->w = outlink->w;
      outpicref->video->h = outlink->h;
  
-         ff_set_systematic_pal2((uint32_t*)outpicref->data[1], outlink->format == AV_PIX_FMT_PAL8 ? AV_PIX_FMT_BGR8 : outlink->format);
 +    if(scale->output_is_pal)
++        avpriv_set_systematic_pal2((uint32_t*)outpicref->data[1], outlink->format == AV_PIX_FMT_PAL8 ? AV_PIX_FMT_BGR8 : outlink->format);
  
 -    av_reduce(&outpicref->video->pixel_aspect.num, &outpicref->video->pixel_aspect.den,
 -              (int64_t)picref->video->pixel_aspect.num * outlink->h * link->w,
 -              (int64_t)picref->video->pixel_aspect.den * outlink->w * link->h,
 +    av_reduce(&outpicref->video->sample_aspect_ratio.num, &outpicref->video->sample_aspect_ratio.den,
 +              (int64_t)picref->video->sample_aspect_ratio.num * outlink->h * link->w,
 +              (int64_t)picref->video->sample_aspect_ratio.den * outlink->w * link->h,
                INT_MAX);
  
      scale->slice_y = 0;

diff --cc libavutil/imgutils.c
Simple merge

diff --cc libavutil/imgutils.h
Simple merge