Merge remote-tracking branch 'qatar/master'

* qatar/master:
  Remove some unused scripts from tools/.
  Add x86 assembly for some 10-bit H.264 intra predict functions.
  v4l2: do not force NTSC as standard
  Skip tableprint.h during 'make checkheaders'.
  Remove unnecessary LIBAVFORMAT_BUILD #ifdef.
  Drop explicit filenames from @file Doxygen tags.
  Skip generated table headers during 'make checkheaders'.
  lavf,lavc: free avoptions in a generic way.
  AVOptions: add av_opt_free convenience function.
  tableprint: Restore mistakenly deleted common.h #include for FF_ARRAY_ELEMS.
  tiff: print log in case of unknown / unsupported tag.
  tiff: fix linesize for mono-white/black formats.
  Fix build of eval-test program
  configure: Document --enable-vaapi
  ac3enc: extract all exponents for the frame at once

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

diff --cc configure
Simple merge

diff --cc doc/APIchanges
index a15e4a2,77eb6d2..89104d0
--- 1/doc/APIchanges
--- 2/doc/APIchanges
+++ b/doc/APIchanges
@@@ -13,30 -13,9 +13,33 @@@ libavutil:   2011-04-1
  
  API changes, most recent first:
  
 +2011-06-06 - xxxxxx - lavfi 2.13.0 - vsrc_buffer.h
 +  Make av_vsrc_buffer_add_video_buffer_ref() accepts an additional
 +  flags parameter in input.
 +
 +2011-06-03 - xxxxxx - lavfi 2.12.0 - avfilter_link_free()
 +  Add avfilter_link_free() function.
 +
 +2011-05-28 - xxxxxx - lavu 51.3.0 - pixdesc.h
 +  Add av_get_pix_fmt_name() in libavutil/pixdesc.h, and deprecate
 +  avcodec_get_pix_fmt_name() in libavcodec/avcodec.h in its favor.
 +
 +2011-05-22 - xxxxxx - lavf 53.2.0 - avformat.h
 +  Introduce avformat_alloc_output_context2() and deprecate
 +  avformat_alloc_output_context().
 +
 +2011-05-22 - xxxxxx - lavfi 2.10.0 - vsrc_buffer.h
 +  Make libavfilter/vsrc_buffer.h public.
 +
 +2011-05-XX - XXXXXX - lavfi 2.8.0 - avcodec.h
 +  Add av_vsrc_buffer_add_frame() to libavfilter/avcodec.h.
 +
 +2011-05-XX - XXXXXX - lavfi 2.6.0 - avcodec.h
 +  Add avfilter_get_video_buffer_ref_from_frame() to libavfilter/avcodec.h.
 +
+ 2011-06-xx - xxxxxxx - lavu 51.3.0 - opt.h
+   Add av_opt_free convenience function.
+ 
  2011-05-28 - 0420bd7 - lavu 51.2.0 - pixdesc.h
    Add av_get_pix_fmt_name() in libavutil/pixdesc.h, and deprecate
    avcodec_get_pix_fmt_name() in libavcodec/avcodec.h in its favor.

diff --cc libavcodec/Makefile
index 768bbde,b772bf1..2721423
--- 1/libavcodec/Makefile
--- 2/libavcodec/Makefile
+++ b/libavcodec/Makefile
@@@ -675,7 -664,9 +679,7 @@@ SKIPHEADERS-$(CONFIG_VAAPI)            
  SKIPHEADERS-$(CONFIG_VDPAU)            += vdpau.h
  SKIPHEADERS-$(CONFIG_XVMC)             += xvmc.h
  
- TESTPROGS = cabac dct eval fft fft-fixed h264 iirfilter rangecoder snow
 -EXAMPLES = api
 -
+ TESTPROGS = cabac dct fft fft-fixed h264 iirfilter rangecoder snow
  TESTPROGS-$(HAVE_MMX) += motion
  TESTOBJS = dctref.o
  

diff --cc libavcodec/ac3enc.c
Simple merge

diff --cc libavcodec/lagarith.c
Simple merge

diff --cc libavcodec/lagarithrac.c
Simple merge

diff --cc libavcodec/lagarithrac.h
Simple merge

diff --cc libavcodec/tableprint.h
Simple merge

diff --cc libavcodec/tiff.c
Simple merge

diff --cc libavcodec/utils.c
index a628ea7,2b417de..922decf
--- 1/libavcodec/utils.c
--- 2/libavcodec/utils.c
+++ b/libavcodec/utils.c
@@@ -858,6 -783,9 +858,9 @@@ av_cold int avcodec_close(AVCodecContex
          avctx->codec->close(avctx);
      avcodec_default_free_buffers(avctx);
      avctx->coded_frame = NULL;
 -    if (avctx->codec->priv_class)
++    if (avctx->codec && avctx->codec->priv_class)
+         av_opt_free(avctx->priv_data);
+     av_opt_free(avctx);
      av_freep(&avctx->priv_data);
      if(avctx->codec && avctx->codec->encode)
          av_freep(&avctx->extradata);

diff --cc libavcodec/x86/Makefile
Simple merge

diff --cc libavcodec/x86/h264_intrapred_init.c
Simple merge

diff --cc libavdevice/bktr.c
Simple merge

diff --cc libavdevice/fbdev.c
Simple merge

diff --cc libavdevice/libdc1394.c
index f77a257,622579b..2017087
--- 1/libavdevice/libdc1394.c
--- 2/libavdevice/libdc1394.c
+++ b/libavdevice/libdc1394.c
@@@ -316,13 -367,11 +316,11 @@@ out_camera
      dc1394_video_set_transmission(dc1394->camera, DC1394_OFF);
      dc1394_camera_free (dc1394->camera);
  out:
-     av_freep(&dc1394->video_size);
-     av_freep(&dc1394->pixel_format);
      dc1394_free(dc1394->d);
 -    return -1;
 +    return ret;
  }
  
 -static int dc1394_v2_read_packet(AVFormatContext *c, AVPacket *pkt)
 +static int dc1394_read_packet(AVFormatContext *c, AVPacket *pkt)
  {
      struct dc1394_data *dc1394 = c->priv_data;
      int res;

diff --cc libavdevice/v4l2.c
index d669f07,2553bca..117f7cc
--- 1/libavdevice/v4l2.c
--- 2/libavdevice/v4l2.c
+++ b/libavdevice/v4l2.c
@@@ -712,10 -729,9 +708,10 @@@ static int v4l2_read_close(AVFormatCont
  
  #define OFFSET(x) offsetof(struct video_data, x)
  #define DEC AV_OPT_FLAG_DECODING_PARAM
 +
  static const AVOption options[] = {
-     { "standard", "", OFFSET(standard), FF_OPT_TYPE_STRING, {.str = NULL }, 0, 0, AV_OPT_FLAG_DECODING_PARAM },
 -    { "standard", "", offsetof(struct video_data, standard), FF_OPT_TYPE_STRING, {.str = NULL }, 0, 0, AV_OPT_FLAG_DECODING_PARAM },
 -    { "channel",  "", offsetof(struct video_data, channel),  FF_OPT_TYPE_INT,    {.dbl = 0 }, 0, INT_MAX, AV_OPT_FLAG_DECODING_PARAM },
++    { "standard", "", OFFSET(standard), FF_OPT_TYPE_STRING, {.str = "NTSC" }, 0, 0, AV_OPT_FLAG_DECODING_PARAM },
 +    { "channel",  "", OFFSET(channel),  FF_OPT_TYPE_INT,    {.dbl = 0 }, 0, INT_MAX, AV_OPT_FLAG_DECODING_PARAM },
      { "video_size", "A string describing frame size, such as 640x480 or hd720.", OFFSET(video_size), FF_OPT_TYPE_STRING, {.str = NULL}, 0, 0, DEC },
      { "pixel_format", "", OFFSET(pixel_format), FF_OPT_TYPE_STRING, {.str = NULL}, 0, 0, DEC },
      { "framerate", "", OFFSET(framerate), FF_OPT_TYPE_STRING, {.str = NULL}, 0, 0, DEC },

diff --cc libavdevice/vfwcap.c
Simple merge

diff --cc libavdevice/x11grab.c
Simple merge

diff --cc libavformat/rawdec.c
Simple merge

diff --cc libavformat/tty.c
Simple merge

diff --cc libavformat/utils.c
Simple merge

diff --cc libavutil/internal.h
Simple merge

diff --cc libavutil/opt.c
Simple merge

diff --cc libavutil/opt.h
Simple merge