summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2015-04-24 21:26:54 +0200
committerMichael Niedermayer <michaelni@gmx.at>2015-04-24 21:27:15 +0200
commit0d3821a6df9688f06aa3c57049a73250b5b6871c (patch)
treed0c18e04bce54f4e7a631a093df73a5c8eff69c7
parent861dec5e90254818636a20188f2844222962bfdf (diff)
parenta4edaeb50fc7510f28a5d79349a7926a182c9930 (diff)
downloadffmpeg-streaming-0d3821a6df9688f06aa3c57049a73250b5b6871c.zip
ffmpeg-streaming-0d3821a6df9688f06aa3c57049a73250b5b6871c.tar.gz
Merge commit 'a4edaeb50fc7510f28a5d79349a7926a182c9930'
* commit 'a4edaeb50fc7510f28a5d79349a7926a182c9930': hq_hqa: Fix table data for profile 17 Merged-by: Michael Niedermayer <michaelni@gmx.at>
-rw-r--r--libavcodec/hq_hqadata.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/libavcodec/hq_hqadata.c b/libavcodec/hq_hqadata.c
index e86a4fb..ae9231a 100644
--- a/libavcodec/hq_hqadata.c
+++ b/libavcodec/hq_hqadata.c
@@ -6204,6 +6204,7 @@ static const uint8_t hq_tab_16[] = {
};
static const uint8_t hq_tab_17[] = {
+ 0, 0, 25, 8, 34, 0, 59, 8, 68, 0, 13, 24, 22, 16, 47,
24, 56, 16, 78, 25, 10, 32, 28, 41, 44, 32, 58, 41, 78, 32,
8, 57, 31, 49, 38, 57, 61, 49, 68, 57, 1, 0, 26, 8, 35,
0, 60, 8, 69, 0, 14, 24, 23, 16, 47, 25, 57, 16, 77, 25,
@@ -8357,7 +8358,7 @@ const HQProfile ff_hq_profile[NUM_HQ_PROFILES] = {
{ hq_tab_14, 352, 240, 8, 22, 15 },
{ hq_tab_15, 352, 288, 8, 18, 22 },
{ hq_tab_16, 176, 144, 8, 9, 11 },
- { hq_tab_17, 1280, 1024, 16, 20, 128 },
+ { hq_tab_17, 1280, 1024, 16, 20, 256 },
{ hq_tab_18, 1280, 960, 16, 25, 192 },
{ hq_tab_19, 1024, 768, 16, 24, 128 },
{ hq_tab_20, 704, 480, 8, 20, 66 },
OpenPOWER on IntegriCloud