Merge remote-tracking branch 'qatar/master'

* qatar/master:
  sunrast: Check for out of bounds reads
  lavc: rename AV_ER_* options to AV_EF_* and rename AGGRESSIVE to BUFFER
  lavc: replace API-bump-triggered AVCodecContext field change with shorter, non-conflicting name
  Add libvpx presets.
  doc/avtools: add forgotten part to stream specifiers description
  swscale: prevent overflow during initialization
  g722: Add a fate test for the encoder
  fate: Add a target for creating a 16000 Hz mono synthetic audio file
  macosx: use the default surface on newer sdl

Conflicts:
	ffplay.c
	libavcodec/avcodec.h

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

10 files changed, 100 insertions, 12 deletions

diff --git a/doc/avtools-common-opts.texi b/doc/avtools-common-opts.texi
index 151c269955..33b3b481b6 100644
--- a/doc/avtools-common-opts.texi
+++ b/doc/avtools-common-opts.texi
@@ -37,7 +37,7 @@ thread count for the second stream to 4.
 'd' for data and 't' for attachments. If @var{stream_index} is given, then
 matches stream number @var{stream_index} of this type. Otherwise matches all
 streams of this type.
-@item @var{program_id}[:@var{stream_index}]
+@item p:@var{program_id}[:@var{stream_index}]
 If @var{stream_index} is given, then matches stream number @var{stream_index} in
 program with id @var{program_id}. Otherwise matches all streams in this program.
 @end table
diff --git a/ffpresets/libvpx-1080p.avpreset b/ffpresets/libvpx-1080p.avpreset
new file mode 100644
index 0000000000..5c7da6fb86
--- /dev/null
+++ b/ffpresets/libvpx-1080p.avpreset
@@ -0,0 +1,17 @@
+g=120
+lag-in-frames=16
+deadline=good
+cpu-used=0
+profile=1
+qmax=51
+qmin=11
+slices=4
+b=2M
+
+#ignored unless using -pass 2
+maxrate=24M
+minrate=100k
+auto-alt-ref=1
+arnr-maxframes=7
+arnr-strength=5
+arnr-type=centered
diff --git a/ffpresets/libvpx-1080p50_60.avpreset b/ffpresets/libvpx-1080p50_60.avpreset
new file mode 100644
index 0000000000..d42f731744
--- /dev/null
+++ b/ffpresets/libvpx-1080p50_60.avpreset
@@ -0,0 +1,17 @@
+g=120
+lag-in-frames=25
+deafline=good
+cpu-used=0
+profile=1
+qmax=51
+qmin=11
+slices=4
+b=2M
+
+#ignored unless using -pass 2
+maxrate=24M
+minrate=100k
+auto-alt-ref=1
+arnr-maxframes=7
+arnr-strength=5
+arnr-type=centered
diff --git a/ffpresets/libvpx-360p.avpreset b/ffpresets/libvpx-360p.avpreset
new file mode 100644
index 0000000000..2cb9e380f3
--- /dev/null
+++ b/ffpresets/libvpx-360p.avpreset
@@ -0,0 +1,16 @@
+g=120
+lag-in-frames=16
+deadline=good
+cpu-used=0
+profile=0
+qmax=63
+qmin=0
+b=768k
+
+#ignored unless using -pass 2
+maxrate=1.5M
+minrate=40k
+auto-alt-ref=1
+arnr-maxframes=7
+arnr-strength=5
+arnr-type=centered
diff --git a/ffpresets/libvpx-720p.avpreset b/ffpresets/libvpx-720p.avpreset
new file mode 100644
index 0000000000..3c7e396ad6
--- /dev/null
+++ b/ffpresets/libvpx-720p.avpreset
@@ -0,0 +1,17 @@
+g=120
+lag-in-frames=16
+deadline=good
+cpu-used=0
+profile=0
+qmax=51
+qmin=11
+slices=4
+b=2M
+
+#ignored unless using -pass 2
+maxrate=24M
+minrate=100k
+auto-alt-ref=1
+arnr-maxframes=7
+arnr-strength=5
+arnr-type=centered
diff --git a/ffpresets/libvpx-720p50_60.avpreset b/ffpresets/libvpx-720p50_60.avpreset
new file mode 100644
index 0000000000..613930063e
--- /dev/null
+++ b/ffpresets/libvpx-720p50_60.avpreset
@@ -0,0 +1,17 @@
+g=120
+lag-in-frames=25
+deadline=good
+cpu-used=0
+profile=0
+qmax=51
+qmin=11
+slices=4
+b=2M
+
+#ignored unless using -pass 2
+maxrate=24M
+minrate=100k
+auto-alt-ref=1
+arnr-maxframes=7
+arnr-strength=5
+arnr-type=centered
diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h
index 2e94751b32..23bb52c74e 100644
--- a/libavcodec/avcodec.h
+++ b/libavcodec/avcodec.h
@@ -2964,15 +2964,11 @@ typedef struct AVCodecContext {
      * - encoding: unused
      * - decoding: Set by user.
      */
-#if FF_API_ER
-    int error_recognition2;
-#else
-    int error_recognition;
-#endif /* FF_API_ER */
-#define AV_ER_CRCCHECK   (1<<0)
-#define AV_ER_BITSTREAM  (1<<1)
-#define AV_ER_AGGRESSIVE (1<<2)
-#define AV_ER_EXPLODE    (1<<3)
+    int err_recognition;
+#define AV_EF_CRCCHECK  (1<<0)
+#define AV_EF_BITSTREAM (1<<1)
+#define AV_EF_BUFFER    (1<<2)
+#define AV_EF_EXPLODE   (1<<3)
 
     /**
      * Current statistics for PTS correction.
@@ -2984,7 +2980,6 @@ typedef struct AVCodecContext {
     int64_t pts_correction_last_pts;       /// PTS of the last frame
     int64_t pts_correction_last_dts;       /// DTS of the last frame
 
-
 } AVCodecContext;
 
 /**
diff --git a/tests/Makefile b/tests/Makefile
index 95271f0347..93f07a5bce 100644
--- a/tests/Makefile
+++ b/tests/Makefile
@@ -26,7 +26,11 @@ tests/data/asynth1.sw: tests/audiogen$(HOSTEXESUF)
 	@mkdir -p tests/data
 	$(M)./$< $@
 
-tests/data/asynth1.sw tests/vsynth%/00.pgm: TAG = GEN
+tests/data/asynth-16000-1.sw: tests/audiogen$(HOSTEXESUF)
+	@mkdir -p tests/data
+	$(M)./$< $@ 16000 1
+
+tests/data/asynth%.sw tests/vsynth%/00.pgm: TAG = GEN
 
 include $(SRC_PATH)/tests/fate.mak
 include $(SRC_PATH)/tests/fate2.mak
diff --git a/tests/fate2.mak b/tests/fate2.mak
index 0bb6654f8d..376a0196b6 100644
--- a/tests/fate2.mak
+++ b/tests/fate2.mak
@@ -133,6 +133,10 @@ fate-gsm-ms: CMD = framecrc -i $(SAMPLES)/gsm/ciao.wav
 FATE_TESTS += fate-g722dec-1
 fate-g722dec-1: CMD = framecrc -i $(SAMPLES)/g722/conf-adminmenu-162.g722
 
+FATE_TESTS += fate-g722enc
+fate-g722enc: tests/data/asynth-16000-1.sw
+fate-g722enc: CMD = md5 -ar 16000 -ac 1 -f s16le -i $(TARGET_PATH)/tests/data/asynth-16000-1.sw -acodec g722 -ac 1 -f g722
+
 FATE_TESTS += fate-msmpeg4v1
 fate-msmpeg4v1: CMD = framecrc -flags +bitexact -dct fastint -idct simple -i $(SAMPLES)/msmpeg4v1/mpg4.avi -an
 
diff --git a/tests/ref/fate/g722enc b/tests/ref/fate/g722enc
new file mode 100644
index 0000000000..c1094565b5
--- /dev/null
+++ b/tests/ref/fate/g722enc
@@ -0,0 +1 @@
+750269cc236541df28e15da5c7b0df7a