Michael Niedermayer
b882079b12
Merge commit 'e9a6ae775dabef3942632e8d4ef95fff94a1b310'
...
* commit 'e9a6ae775dabef3942632e8d4ef95fff94a1b310':
dpxenc: mention missing break
Conflicts:
libavcodec/dpxenc.c
No change as the changed code is implemented differently in FFmpeg
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-11-13 13:32:08 +01:00
Michael Niedermayer
ccfae03815
Merge commit '4dda5e9b0829b119c17d950906c61d3ebffc494f'
...
* commit '4dda5e9b0829b119c17d950906c61d3ebffc494f':
sunrastenc: mention missing break
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-11-13 13:31:08 +01:00
Michael Niedermayer
ef4e54e0df
Merge commit '28d82b7675bea76a1349070a3cdd737d964d4775'
...
* commit '28d82b7675bea76a1349070a3cdd737d964d4775':
vc1dec: refactor check with missing parenthesis
Conflicts:
libavcodec/vc1_mc.c
tests/ref/fate/vc1_ilaced_twomv
Theres no change to the reference checksums as this bug was not
in FFmpeg
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-11-13 13:23:42 +01:00
Michael Niedermayer
94cf1ef008
Merge commit '2c98dc75f2802a2fe91922d4a11b698b66420e5b'
...
* commit '2c98dc75f2802a2fe91922d4a11b698b66420e5b':
vc1dec: always initialize tx and ty
Not merged, tx/ty are initialized on every codepath before use
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-11-13 13:11:41 +01:00
Michael Niedermayer
7f8ef7876e
Merge commit 'e3f50f247155216229e34f165bae8c329d5a001e'
...
* commit 'e3f50f247155216229e34f165bae8c329d5a001e':
dnxhdenc: check negative index
Conflicts:
libavcodec/dnxhdenc.c
Not merged, the cid index thats taken out of our table will be found again in
said table.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-11-13 12:56:32 +01:00
Michael Niedermayer
76fa78911f
Merge commit 'b1b1a7370e141c912e3d0bbaa668dcee05c3ad67'
...
* commit 'b1b1a7370e141c912e3d0bbaa668dcee05c3ad67':
display: fix order of operands
Conflicts:
libavcodec/h264.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-11-13 12:53:31 +01:00
Michael Niedermayer
946a5cb64d
Merge commit 'bdcb5794f0c2d74371152303bffe4172671af264'
...
* commit 'bdcb5794f0c2d74371152303bffe4172671af264':
nellymoserenc: fix array index
Not merged, the original code was correct.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-11-13 12:38:05 +01:00
Michael Niedermayer
0f29e92091
Merge commit 'aa7c429c4e8e561009176d51b7dcb626c85eb276'
...
* commit 'aa7c429c4e8e561009176d51b7dcb626c85eb276':
nellymoserenc: fix array element ordering
See: 62722ae2d4
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-11-13 12:13:06 +01:00
Michael Niedermayer
7b824e8b25
Merge commit '8dd0a2c5cf40a8a49faae985adc11750b6429132'
...
* commit '8dd0a2c5cf40a8a49faae985adc11750b6429132':
libopusenc: prevent an out-of-bounds read by returning early
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-11-13 12:12:27 +01:00
Michael Niedermayer
3c6e148e84
Merge commit 'b09cf8afc5199d359ac985ad7cea72a6a9f20e4e'
...
* commit 'b09cf8afc5199d359ac985ad7cea72a6a9f20e4e':
libopusenc: check return value
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-11-13 12:02:05 +01:00
Michael Niedermayer
8e6084eebe
Merge commit '29234f56818135faf2f1868ab324c073abd28fbd'
...
* commit '29234f56818135faf2f1868ab324c073abd28fbd':
vp7: fix checking vp7_feature_value_size()
See: 28f8114bd2
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-11-13 12:00:29 +01:00
Michael Niedermayer
64e12aec96
Merge commit '68a35473ed423a14731c418939fba7913647979a'
...
* commit '68a35473ed423a14731c418939fba7913647979a':
4xm: more thorought check for negative index and negative shift
Conflicts:
libavcodec/4xm.c
Mostly not merged, the added checks, check for impossible conditions
for paranoias sake they are replaced by asserts but thats probably overkill
the vlc table does not contain out of range values or holes,
nor does it permit the log2 values to become negative. Whenever a
log2 value reaches 0 the selected table no longer contains an entry to trigger
the case that would decrease it further
Adding such impossible checks would confuse the reader
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-11-13 11:37:59 +01:00
Michael Niedermayer
3e1ac10345
avcodec/utils: Add ATRAC3+ to av_get_audio_frame_duration()
...
Fixes Ticket3979
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-11-13 02:48:40 +01:00
Vittorio Giovara
e9a6ae775d
dpxenc: mention missing break
...
Bug-Id: CID 732229
2014-11-13 01:41:26 +01:00
Vittorio Giovara
4dda5e9b08
sunrastenc: mention missing break
...
Bug-Id: CID 732231
2014-11-13 01:41:26 +01:00
Vittorio Giovara
28d82b7675
vc1dec: refactor check with missing parenthesis
...
FATE tests updated accordingly, no visual difference.
CC: libav-stable@libav.org
Bug-Id: CID 1087087
2014-11-13 01:41:25 +01:00
Vittorio Giovara
2c98dc75f2
vc1dec: always initialize tx and ty
...
CC: libav-stable@libav.org
Bug-Id: CID 1245702 / CID 1245703
2014-11-13 01:41:25 +01:00
Vittorio Giovara
e3f50f2471
dnxhdenc: check negative index
...
CC: libav-stable@libav.org
Bug-Id: CID 700464
2014-11-13 01:41:25 +01:00
Vittorio Giovara
b1b1a7370e
display: fix order of operands
...
CC: libav-stable@libav.org
Bug-Id: CID 1238828 / CID 1238832
2014-11-13 01:41:25 +01:00
Vittorio Giovara
bdcb5794f0
nellymoserenc: fix array index
...
CC: libav-stable@libav.org
Bug-Id: CID 732258
2014-11-13 01:41:25 +01:00
Michael Niedermayer
aa7c429c4e
nellymoserenc: fix array element ordering
...
Fixes assertion failures and valgrind warnings in trellis encoder.
CC: libav-stable@libav.org
Bug-Id: CID 732256 / CID 732257
2014-11-13 01:41:25 +01:00
Vittorio Giovara
8dd0a2c5cf
libopusenc: prevent an out-of-bounds read by returning early
...
CC: libav-stable@libav.org
Bug-Id: CID 1244188
2014-11-13 01:41:25 +01:00
Vittorio Giovara
b09cf8afc5
libopusenc: check return value
...
CC: libav-stable@libav.org
Bug-Id: CID 739870
2014-11-13 01:41:25 +01:00
Michael Niedermayer
29234f5681
vp7: fix checking vp7_feature_value_size()
...
CC: libav-stable@libav.org
Bug-Id: CID 1197061
2014-11-13 01:41:25 +01:00
Vittorio Giovara
68a35473ed
4xm: more thorought check for negative index and negative shift
...
CC: libav-stable@libav.org
Bug-Id: CID 1087094
2014-11-13 01:18:09 +01:00
Michael Niedermayer
2f6bb86f85
swscale/utils: support bayer input + scaling, and bayer input + any supported output
...
Fixes Ticket4053
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-11-12 23:59:37 +01:00
Lukasz Marek
173d51c982
lavu/opt: fix av_opt_get function
...
Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com>
2014-11-12 23:34:05 +01:00
Lukasz Marek
5aed6f56d9
ffserver_config: report not closed last tag
...
Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com>
2014-11-12 23:33:08 +01:00
Lukasz Marek
5dc0f607e7
lavu/opt: fix memleak in test
...
Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com>
2014-11-12 23:32:31 +01:00
Michael Niedermayer
d03867c248
avcodec/dvbsubdec: av_assert* instead of assert()
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-11-12 20:08:24 +01:00
James Almer
84ccc317ce
x86/flacdsp: separate decoder and encoder dsp initialization
...
Signed-off-by: James Almer <jamrial@gmail.com>
2014-11-12 14:41:45 -03:00
Michael Niedermayer
39dfe6801a
avcodec/dvbsubdec: Cleanup on *malloc failure
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-11-12 17:54:52 +01:00
Rong Yan
e74e14608f
libswscale/ppc/swscale_altivec.c : fix hScale_altivec_real() yuv2planeX_16_altivec() yuv2planeX_8() for little endian
...
add marcos GET_LS() GET_VF() LOAD_FILTER() LOAD_L1() GET_VF4() FIRST_LOAD() UPDATE_PTR() LOAD_SRCV() LOAD_SRCV8() GET_VFD() for POWER LE
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-11-12 15:15:03 +01:00
Carl Eugen Hoyos
1f4bce894a
lavf/tcp: Clarify that the -timeout option takes microseconds.
2014-11-12 13:52:56 +01:00
Carl Eugen Hoyos
0ea54d698b
lavd/avfoundation: Remove unused -frame_rate option.
2014-11-12 09:55:11 +01:00
Reimar Döffinger
5e8e2f3861
configure: Hack to treat x32 as x86_64.
...
Allows shared compilation on x32 with --disable-asm.
2014-11-12 09:53:01 +01:00
Michael Niedermayer
9d6ad68fa4
avcodec/h264_parser: Avoid adding SEI to the global header
...
Only consider SEI when no PPS has been found yet
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-11-12 03:28:15 +01:00
Michael Niedermayer
12aab852c5
Merge remote-tracking branch 'cus/stable'
...
* cus/stable:
ffplay: signal the frame queue before closing audio
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-11-12 01:05:10 +01:00
Vignesh Venkatasubramanian
597d826123
lavf/webmdashenc: Representation IDs should be unique.
...
According to the DASH spec, Representation IDs should be unique
across all adaptation sets. Fixing that and updating the fate
reference file to reflect this change.
Signed-off-by: Vignesh Venkatasubramanian <vigneshv@google.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-11-12 00:21:37 +01:00
Michael Niedermayer
dadc1f5ee9
Merge commit 'c9c7d59b7d26f0328d612995dd9256337ae1cbfb'
...
* commit 'c9c7d59b7d26f0328d612995dd9256337ae1cbfb':
tiff: Use av_mallocz_array
Conflicts:
libavcodec/tiffenc.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-11-12 00:08:06 +01:00
Michael Niedermayer
1e16492b98
Merge commit 'c6074a30ba3b5fb4319ee6ee599656d58548cdc8'
...
* commit 'c6074a30ba3b5fb4319ee6ee599656d58548cdc8':
opt: Fix the documentation mentioning av_set_string3
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-11-11 23:54:52 +01:00
Michael Niedermayer
940f5c08e5
Merge commit '1b667269062eb6aec0b8726393ea91b7f7f57fde'
...
* commit '1b667269062eb6aec0b8726393ea91b7f7f57fde':
h264_parser: don't stop on SPS_EXT in split
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-11-11 23:21:12 +01:00
Michael Niedermayer
69b2d43d6a
Merge commit '4cb9f1a77432de6f368df69bebbc082368a88c86'
...
* commit '4cb9f1a77432de6f368df69bebbc082368a88c86':
h264_cabac: fix one fill_rectangle() indentation level
See: 4260ed462b
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-11-11 23:18:39 +01:00
Michael Niedermayer
70cbb47360
Merge commit '60b055133485891405722bc9722e2c74fc9764b8'
...
* commit '60b055133485891405722bc9722e2c74fc9764b8':
png_parser: fix size of chunk_lenght
Conflicts:
libavcodec/png_parser.c
See: 2ee6dca3b8
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-11-11 23:16:50 +01:00
Michael Niedermayer
287eb69973
Merge commit '443502aed8b814d883825e52e91e4f018955aa66'
...
* commit '443502aed8b814d883825e52e91e4f018955aa66':
dvbsubdec: move shared codepath
Conflicts:
libavcodec/dvbsubdec.c
The merged code is ignored and the factorization redone with
the code that is in FFmpeg.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-11-11 23:08:55 +01:00
Marton Balint
eaf4ab9802
ffplay: signal the frame queue before closing audio
...
Fixed regression caused by 631ac655c0
when ffplay
does not quit if the audio thread is blocked.
Signed-off-by: Marton Balint <cus@passwd.hu>
2014-11-11 23:02:00 +01:00
Michael Niedermayer
e0c36f5825
avcodec/dvbsubdec: Fix 8bit non_mod case
...
Untested, i failed to find a sample which triggers this case
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-11-11 22:57:01 +01:00
Michael Niedermayer
2813dabdd4
avcodec/dvbsubdec: use av_freep() for saftey
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-11-11 22:20:20 +01:00
Michael Niedermayer
4809ac75fc
Merge commit '2383323661f3b8342b2c4d356fcfe8c5d1b045f8'
...
* commit '2383323661f3b8342b2c4d356fcfe8c5d1b045f8':
dvbsubdec: improve error checking
Conflicts:
libavcodec/dvbsubdec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-11-11 22:19:54 +01:00
Michael Niedermayer
6229f7823e
avcodec/dvbsubdec: Add return code to save_subtitle_set()
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-11-11 22:15:14 +01:00