Merge remote-tracking branch 'qatar/master'

* qatar/master:
  mpegvideo_enc: only allocate output packet when we know there will be output
  Add names for more channel layouts to the channel layout map.
  sunrast: Add a sample request for RMP_RAW colormap.
  avcodec: do not override pts or duration from the audio encoder
  Add prores regression test.
  Enable already existing rso regression test.
  Add regression test for "sox" format muxer/demuxer.
  Add dpx encoding regression test.
  swscale: K&R formatting cosmetics for PowerPC code (part I/II)
  img2: Use ff_guess_image2_codec(filename) shorthand where appropriate.
  Clarify licensing information about files borrowed from libjpeg.
  Mark mutable static data const where appropriate.
  avplay: fix -threads option
  dvbsubdec: avoid undefined signed left shift in RGBA macro
  mlpdec: use av_log_ask_for_sample()
  gif: K&R formatting cosmetics
  png: make .long_name more descriptive
  movdec: Adjust keyframe flagging in fragmented files
  rv34: change most "int stride" into "ptrdiff_t stride".

Conflicts:
	avprobe.c
	ffplay.c
	libavcodec/mlpdec.c
	libavcodec/mpegvideo_enc.c
	libavcodec/pngenc.c
	libavcodec/x86/v210-init.c
	libavfilter/vf_boxblur.c
	libavfilter/vf_crop.c
	libavfilter/vf_drawtext.c
	libavfilter/vf_lut.c
	libavfilter/vf_overlay.c
	libavfilter/vf_pad.c
	libavfilter/vf_scale.c
	libavfilter/vf_select.c
	libavfilter/vf_setpts.c
	libavfilter/vf_settb.c
	libavformat/img2.c
	libavutil/audioconvert.c
	tests/codec-regression.sh
	tests/lavf-regression.sh
	tests/ref/lavf/dpx
	tests/ref/vsynth1/prores
	tests/ref/vsynth2/prores

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

10 files changed, 12 insertions, 12 deletions

diff --git a/libavfilter/vf_boxblur.c b/libavfilter/vf_boxblur.c
index ddb4b258e9..60c9be9a0b 100644
--- a/libavfilter/vf_boxblur.c
+++ b/libavfilter/vf_boxblur.c
@@ -30,7 +30,7 @@
 #include "libavutil/pixdesc.h"
 #include "avfilter.h"
 
-static const char * const var_names[] = {
+static const char *const var_names[] = {
     "w",
     "h",
     "cw",
diff --git a/libavfilter/vf_crop.c b/libavfilter/vf_crop.c
index f9039b5943..117cd4397e 100644
--- a/libavfilter/vf_crop.c
+++ b/libavfilter/vf_crop.c
@@ -32,7 +32,7 @@
 #include "libavutil/imgutils.h"
 #include "libavutil/mathematics.h"
 
-static const char * const var_names[] = {
+static const char *const var_names[] = {
     "in_w", "iw",   ///< width  of the input video
     "in_h", "ih",   ///< height of the input video
     "out_w", "ow",  ///< width  of the cropped video
diff --git a/libavfilter/vf_drawtext.c b/libavfilter/vf_drawtext.c
index 7c216800a6..32371c03fd 100644
--- a/libavfilter/vf_drawtext.c
+++ b/libavfilter/vf_drawtext.c
@@ -51,7 +51,7 @@
 #include FT_FREETYPE_H
 #include FT_GLYPH_H
 
-static const char * const var_names[] = {
+static const char *const var_names[] = {
     "main_w", "w", "W",       ///< width  of the input video
     "main_h", "h", "H",       ///< height of the input video
     "tw", "text_w",           ///< width  of the rendered text
@@ -72,8 +72,8 @@ static const char * const var_names[] = {
     NULL
 };
 
-static const char *fun2_names[] = {
-    "rand",
+static const char *const fun2_names[] = {
+    "rand"
 };
 
 static double drand(void *opaque, double min, double max)
diff --git a/libavfilter/vf_lut.c b/libavfilter/vf_lut.c
index 52d9873adb..41199165c0 100644
--- a/libavfilter/vf_lut.c
+++ b/libavfilter/vf_lut.c
@@ -30,7 +30,7 @@
 #include "avfilter.h"
 #include "internal.h"
 
-static const char * const var_names[] = {
+static const char *const var_names[] = {
     "w",        ///< width of the input video
     "h",        ///< height of the input video
     "val",      ///< input value for the pixel
diff --git a/libavfilter/vf_overlay.c b/libavfilter/vf_overlay.c
index 638da2d0e8..04cacad635 100644
--- a/libavfilter/vf_overlay.c
+++ b/libavfilter/vf_overlay.c
@@ -38,7 +38,7 @@
 #include "internal.h"
 #include "drawutils.h"
 
-static const char * const var_names[] = {
+static const char *const var_names[] = {
     "main_w",    "W", ///< width  of the main    video
     "main_h",    "H", ///< height of the main    video
     "overlay_w", "w", ///< width  of the overlay video
diff --git a/libavfilter/vf_pad.c b/libavfilter/vf_pad.c
index 1634f789f0..e226a003d1 100644
--- a/libavfilter/vf_pad.c
+++ b/libavfilter/vf_pad.c
@@ -35,7 +35,7 @@
 #include "libavutil/mathematics.h"
 #include "drawutils.h"
 
-static const char * const var_names[] = {
+static const char *const var_names[] = {
     "in_w",   "iw",
     "in_h",   "ih",
     "out_w",  "ow",
diff --git a/libavfilter/vf_scale.c b/libavfilter/vf_scale.c
index 0437751667..af08a82d81 100644
--- a/libavfilter/vf_scale.c
+++ b/libavfilter/vf_scale.c
@@ -31,7 +31,7 @@
 #include "libavutil/avassert.h"
 #include "libswscale/swscale.h"
 
-static const char * const var_names[] = {
+static const char *const var_names[] = {
     "in_w",   "iw",
     "in_h",   "ih",
     "out_w",  "ow",
diff --git a/libavfilter/vf_select.c b/libavfilter/vf_select.c
index 5cbe663ea1..2ffa496788 100644
--- a/libavfilter/vf_select.c
+++ b/libavfilter/vf_select.c
@@ -27,7 +27,7 @@
 #include "libavutil/fifo.h"
 #include "avfilter.h"
 
-static const char * const var_names[] = {
+static const char *const var_names[] = {
     "TB",                ///< timebase
 
     "pts",               ///< original pts in the file of the frame
diff --git a/libavfilter/vf_setpts.c b/libavfilter/vf_setpts.c
index 8c749753bb..57b97bb9bd 100644
--- a/libavfilter/vf_setpts.c
+++ b/libavfilter/vf_setpts.c
@@ -30,7 +30,7 @@
 #include "libavutil/mathematics.h"
 #include "avfilter.h"
 
-static const char * const var_names[] = {
+static const char *const var_names[] = {
     "INTERLACED",  ///< tell if the current frame is interlaced
     "N",           ///< frame number (starting at zero)
     "POS",         ///< original position in the file of the frame
diff --git a/libavfilter/vf_settb.c b/libavfilter/vf_settb.c
index b9369d5436..84bebd6e35 100644
--- a/libavfilter/vf_settb.c
+++ b/libavfilter/vf_settb.c
@@ -30,7 +30,7 @@
 #include "avfilter.h"
 #include "internal.h"
 
-static const char * const var_names[] = {
+static const char *const var_names[] = {
     "AVTB",   /* default timebase 1/AV_TIME_BASE */
     "intb",   /* input timebase */
     NULL