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
Michael Niedermayer
db36b6e2ac
Merge commit '1bdd21d97528d870fbb4388e837abaf390f2f7d7'
...
* commit '1bdd21d97528d870fbb4388e837abaf390f2f7d7':
dvbsubdec: add missing break
See: 8b973d4937
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-11-11 22:05:38 +01:00
Michael Niedermayer
261d2eaa7f
Merge commit 'a6defd1f5b1bffcea7aa00ff379a6602cdaf2d05'
...
* commit 'a6defd1f5b1bffcea7aa00ff379a6602cdaf2d05':
hevc_cabac: decrease CABAC_MAX_BIN
See: 8120668351
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-11-11 22:03:51 +01:00
Michael Niedermayer
4dd85093f1
Merge commit '9e9be5a20c0b36dce1cae11f5f5957886231a764'
...
* commit '9e9be5a20c0b36dce1cae11f5f5957886231a764':
hevc_mvs: prevent unitialized use
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-11-11 21:57:41 +01:00
Lukasz Marek
db6be5416c
fate: add opt-test
2014-11-11 21:52:26 +01:00
Lukasz Marek
b54effba4f
lavu/opt: update tests
...
In general this commit prepares opt tests to be added to fate.
The commit set some non-zero defaults for test options.
It allows to check if defaults are really set.
Added printing of default values.
Added more cases for testing av_set_options_string
Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com>
2014-11-11 21:52:26 +01:00
Lukasz Marek
4efc79649b
lavu/opt: add support for binary defaults
...
Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com>
2014-11-11 21:52:26 +01:00
Lukasz Marek
bb60142f56
lavu/opt: check for NULL before parsing
...
set_string_binary crashes when called with val==NULL
Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com>
2014-11-11 21:52:26 +01:00
Michael Niedermayer
7edb5eec4f
Merge commit '0e1ebfebc8326069732795698a82f3fea0742a54'
...
* commit '0e1ebfebc8326069732795698a82f3fea0742a54':
4xm: drop unnecessary check
Conflicts:
libavcodec/4xm.c
The check is currently redundant, it is for saftey left in place though
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-11-11 21:38:55 +01:00
Michael Niedermayer
76bd8e16af
Merge commit '7c61e4b1a0f9e9f5b7bc08879e9e101eb90b19ea'
...
* commit '7c61e4b1a0f9e9f5b7bc08879e9e101eb90b19ea':
hpeldsp: Increase put_no_rnd_pixels_tab[][] size
See: 1e41b8cd07
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-11-11 21:36:15 +01:00
Michael Niedermayer
8d6b51b182
Merge commit 'db71c4926d948717ce3b74253eb385dc43dcb14d'
...
* commit 'db71c4926d948717ce3b74253eb385dc43dcb14d':
mjpegenc: fix argument size in encode_mb
Conflicts:
libavcodec/mjpegenc.c
libavcodec/mjpegenc.h
See: 256f530603
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-11-11 21:34:45 +01:00
Michael Niedermayer
d312769166
Merge commit 'f349f4b5502c94943c30001b8a4d75daded3281c'
...
* commit 'f349f4b5502c94943c30001b8a4d75daded3281c':
mpegvideo: fix size of array
See: 9f02d4ed0f
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-11-11 21:26:48 +01:00
Michael Niedermayer
9311026ec7
Merge commit '898e9a24ef13d8c56b4abf4ee0af09cdb0343e2d'
...
* commit '898e9a24ef13d8c56b4abf4ee0af09cdb0343e2d':
mpegvideo: check mpv return value
Conflicts:
libavcodec/mpegvideo.c
See: f4d73f0fb5
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-11-11 21:22:09 +01:00
Michael Niedermayer
aeb1621d1f
Merge commit 'fe27aeaeab07142b1acd2690c64ee6973bdd7eba'
...
* commit 'fe27aeaeab07142b1acd2690c64ee6973bdd7eba':
mpeg12enc: increase declared size of block function argument
See: 2cf514354b
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-11-11 21:16:00 +01:00
Michael Niedermayer
81e3f819bd
Merge commit '52f954da7594c31ad94c9bcb54290145b59b27f5'
...
* commit '52f954da7594c31ad94c9bcb54290145b59b27f5':
libavcodec: Unconditionally build xiph.o
Conflicts:
libavcodec/Makefile
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-11-11 20:58:33 +01:00
Marvin Scholz
2c0bf76bb3
MAINTAINERS: Add myself as maintainer for Icecast protocol
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-11-11 19:32:30 +01:00
Marvin Scholz
17dc39e76b
Icecast: Use 100-continue if possible for proper error handling
...
Using 100-continue ffmpeg will only send data if the server confirms it,
so if there is an error with auth or mounpoint, this allows that it is
properly reported to the user. Else ffmpeg sends data and just quits at
some point without an error message.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-11-11 14:57:46 +01:00
Marvin Scholz
5e08b54f47
Icecast: always send a content-type
...
use a default (audio/mpeg for historical reason) if none. Required since Icecast 2.4.1
Not using AVOption default because this breaks content-type warnings (needs to
detect if no type was set by the user)
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-11-11 14:49:08 +01:00
Luca Barbato
c9c7d59b7d
tiff: Use av_mallocz_array
...
CC: libav-stable@libav.org
2014-11-11 12:01:00 +01:00
Luca Barbato
c6074a30ba
opt: Fix the documentation mentioning av_set_string3
...
It is av_opt_set now.
2014-11-11 11:49:55 +01:00
John Stebbins
1b66726906
h264_parser: don't stop on SPS_EXT in split
...
Add SPS_EXT, SEI, and subset SPS to codes that are skipped during split.
These codes can come before the PPS and results in incomplete extradata.
2014-11-11 11:49:55 +01:00
Michael Niedermayer
4cb9f1a774
h264_cabac: fix one fill_rectangle() indentation level
...
Bug-Id: CID 1087088
2014-11-11 11:49:54 +01:00
Vittorio Giovara
60b0551334
png_parser: fix size of chunk_lenght
...
Fixes the comparison against constant value 0x7fffffff.
CC: libav-stable@libav.org
Bug-Id: CID 1198260
2014-11-11 11:49:54 +01:00
Vittorio Giovara
443502aed8
dvbsubdec: move shared codepath
...
CC: libav-stable@libav.org
Bug-Id: CID 1238839
2014-11-11 11:49:54 +01:00
Vittorio Giovara
2383323661
dvbsubdec: improve error checking
...
Use av_mallocz_array instead of iterating and check the returned memory.
Check returned memory and cleanly exit in case of error during the loop.
Avoid a null pointer dereference for invalid data.
CC: libav-stable@libav.org
Bug-Id: CID 29575
2014-11-11 11:49:54 +01:00
Jernej Fijačko
1bdd21d975
dvbsubdec: add missing break
...
Fix a memory leak too.
CC: libav-stable@libav.org
Bug-Id: CID 732230
2014-11-11 11:49:54 +01:00
Michael Niedermayer
a6defd1f5b
hevc_cabac: decrease CABAC_MAX_BIN
...
Prevents shifts with undefined behavior, as no syntax element has a valid
value greater than 1 << 31.
Bug-Id: CID 1206635
2014-11-11 11:49:54 +01:00
Vittorio Giovara
9e9be5a20c
hevc_mvs: prevent unitialized use
...
CC: libav-stable@libav.org
Bug-Id: CID 1244202
2014-11-11 11:49:47 +01:00
Changjiang Wei
6f2068e626
avcodec/hevc.c: for big negative mvy value, should wait line 0 of ref frame due to edge extending
...
Reviewed-by: Mickaël Raulet <mraulet@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-11-11 11:45:20 +01:00
Vittorio Giovara
0e1ebfebc8
4xm: drop unnecessary check
...
data_size is always >= 0 in this case.
CC: libav-stable@libav.org
Bug-Id: CID 1238788
2014-11-11 11:41:49 +01:00
Michael Niedermayer
7c61e4b1a0
hpeldsp: Increase put_no_rnd_pixels_tab[][] size
...
CC: libav-stable@libav.org
Bug-Id: CID 991852
2014-11-11 11:41:49 +01:00
Vittorio Giovara
db71c4926d
mjpegenc: fix argument size in encode_mb
...
CC: libav-stable@libav.org
Bug-Id: CID 1047235
2014-11-11 11:41:49 +01:00
Rong Yan
cfaa233962
libavcodec/ppc/me_cmp.c : support little endian in sse8_altivec(), hadamard8_diff8x8_altivec() and hadamard8_diff16x8_altivec()
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-11-11 11:37:13 +01:00
Rong Yan
bb38cb14cc
libavcodec/ppc/me_cmp.c : factorize little and big endian code
...
add marcos GET_PERM() LOAD_PIX() for POWER LE
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-11-11 11:34:38 +01:00
Vittorio Giovara
f349f4b550
mpegvideo: fix size of array
...
CC: libav-stable@libav.org
Bug-Id: CID 1238789
2014-11-11 11:26:02 +01:00