Merge remote-tracking branch 'qatar/master'

* qatar/master:
  build: eamad: Add missing dependency on mpegvideo code
  build: utvideoenc: Add missing dependency on Huffman code
  avopt: Reorder the default_val struct, making i64 the first field

Conflicts:
	configure
	doc/APIchanges
	libavutil/version.h

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

diff --git a/configure b/configure
index d6aee54..b0349ef 100755 (executable)
--- a/configure
+++ b/configure
@@ -1586,7 +1586,7 @@ dnxhd_encoder_select="aandcttables mpegvideoenc"
 dxa_decoder_select="zlib"
 eac3_decoder_select="ac3_decoder"
 eac3_encoder_select="ac3_encoder"
-eamad_decoder_select="aandcttables error_resilience"
+eamad_decoder_select="aandcttables error_resilience mpegvideo"
 eatgq_decoder_select="aandcttables"
 eatqi_decoder_select="aandcttables error_resilience mpegvideo"
 exr_decoder_select="zlib"
@@ -1697,6 +1697,7 @@ tiff_decoder_suggest="zlib"
 tiff_encoder_suggest="zlib"
 tscc_decoder_select="zlib"
 twinvq_decoder_select="mdct lsp sinewin"
+utvideo_encoder_select="huffman"
 vc1_crystalhd_decoder_select="crystalhd"
 vc1_decoder_select="h263_decoder h264chroma h264qpel"
 vc1_dxva2_hwaccel_deps="dxva2api_h"

diff --git a/doc/APIchanges b/doc/APIchanges
index f9a624e..5af9eb2 100644 (file)
--- a/doc/APIchanges
+++ b/doc/APIchanges
@@ -77,6 +77,10 @@ API changes, most recent first:
 2012-03-26 - a67d9cf - lavfi 2.66.100
   Add avfilter_fill_frame_from_{audio_,}buffer_ref() functions.
 
+2012-09-04 - xxxxxxx - lavu 51.40.0 - opt.h
+  Reordered the fields in default_val in AVOption, changed which
+  default_val field is used for which AVOptionType.
+
 2012-xx-xx - xxxxxxx - lavc 54.26.1 - avcodec.h
   Add codec descriptor properties AV_CODEC_PROP_LOSSY and
   AV_CODEC_PROP_LOSSLESS.

diff --git a/libavutil/opt.h b/libavutil/opt.h
index 3bf30a5..ea22616 100644 (file)
--- a/libavutil/opt.h
+++ b/libavutil/opt.h
@@ -263,10 +263,10 @@ typedef struct AVOption {
      * the default value for scalar options
      */
     union {
+        int64_t i64;
         double dbl;
         const char *str;
         /* TODO those are unused now */
-        int64_t i64;
         AVRational q;
     } default_val;
     double min;                 ///< minimum valid value for the option

diff --git a/libavutil/version.h b/libavutil/version.h
index 0b9ae39..f8cc602 100644 (file)
--- a/libavutil/version.h
+++ b/libavutil/version.h
@@ -39,7 +39,7 @@
  */
 
 #define LIBAVUTIL_VERSION_MAJOR 51
-#define LIBAVUTIL_VERSION_MINOR 70
+#define LIBAVUTIL_VERSION_MINOR 71
 #define LIBAVUTIL_VERSION_MICRO 100
 
 #define LIBAVUTIL_VERSION_INT   AV_VERSION_INT(LIBAVUTIL_VERSION_MAJOR, \