Michael Niedermayer
c78a416985
Merge remote-tracking branch 'qatar/master'
...
* qatar/master:
fft-test: add a missing #include
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-10-26 21:59:24 +02:00
Michael Niedermayer
3fcc2684e4
Merge commit 'b284e1ffe343d6697fb950d1ee517bafda8a9844'
...
* commit 'b284e1ffe343d6697fb950d1ee517bafda8a9844':
mem: do not check for negative size
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-10-26 21:49:04 +02:00
Michael Niedermayer
d2db1bb7de
avformat/http: dont fail with unknown Content-Encodings
...
Fixes: http://m1.file.xiami.com/282/23282/343749/1769075752_709488_l.mp3
Based-on-patch-by: Crossle Song <sxm@yixia.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-10-26 19:20:01 +02:00
Michael Niedermayer
e0b2bdd37a
avcodec/h264_parser: heuristically detect non marked keyframes
...
Fixes Ticket3083
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-10-26 15:56:11 +02:00
Michael Niedermayer
41efb8d9a7
avcodec/x86/cabac: include get_cabac_bypass_sign_x86() under #if !BROKEN_COMPILER
...
this might fix Ticket2999 as well as some fate clients
untested as the original patch submitter no longer has the environment to test
this should be reverted if it does not fix the issues
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-10-26 15:06:55 +02:00
Lukasz Marek
99a4c86a32
configure: link with built libs when pc-uninstalled is used
...
Signed-off-by: Lukasz Marek <lukasz.m.luki@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-10-26 14:06:40 +02:00
Michael Niedermayer
444ce03f0f
Merge remote-tracking branch 'cus/stable'
...
* cus/stable:
ffplay: add support for libswresample options
ffplay: use av_frame_get_pkt_pos instead directly accessing pkt pos
ffplay: factor out picture freeing code
ffplay: update and extend documentation for channel and stream switching
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-10-26 13:54:29 +02:00
Marton Balint
44758b4d17
ffplay: add support for libswresample options
...
Signed-off-by: Marton Balint <cus@passwd.hu>
2013-10-26 12:23:54 +02:00
Marton Balint
04de0e04c5
ffplay: use av_frame_get_pkt_pos instead directly accessing pkt pos
...
Signed-off-by: Marton Balint <cus@passwd.hu>
2013-10-26 12:23:54 +02:00
Marton Balint
2d059d8de1
ffplay: factor out picture freeing code
...
Signed-off-by: Marton Balint <cus@passwd.hu>
2013-10-26 12:23:54 +02:00
Marton Balint
060c42bc3d
ffplay: update and extend documentation for channel and stream switching
...
Signed-off-by: Marton Balint <cus@passwd.hu>
2013-10-26 12:23:54 +02:00
Michael Niedermayer
fcd08b7770
avformat/md5enc: add format, version and column headers
...
See Ticket2280
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-10-26 12:16:04 +02:00
Michael Niedermayer
6889b78fe0
doc/issue_tracker: add 2 missing issue types
...
Reviewed-by: Lou Logan <lou@lrcd.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-10-26 11:29:42 +02:00
Michael Niedermayer
0feecb62ab
Merge remote-tracking branch 'lukaszmluki/master'
...
* lukaszmluki/master:
lavd/pulse_audio_enc: avoid vars in for()
lavd/pulse_audio_enc: add another default to stream name
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-10-26 10:31:04 +02:00
Anton Khirnov
834259528b
fft-test: add a missing #include
...
stdio.h needed for printf since 7177df90a0
2013-10-26 09:11:22 +02:00
Vittorio Giovara
b284e1ffe3
mem: do not check for negative size
...
size_t is guaranteed to be unsigned
Signed-off-by: Anton Khirnov <anton@khirnov.net>
2013-10-26 09:05:56 +02:00
Michael Niedermayer
7e19c549ba
Merge remote-tracking branch 'qatar/master'
...
* qatar/master:
fate: aac: Add test for AAC-ELD
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-10-26 02:58:08 +02:00
Michael Niedermayer
8c508a0354
Merge commit 'adea4512c6087280702e2423de55cea050e20a98'
...
* commit 'adea4512c6087280702e2423de55cea050e20a98':
aacdec: Fix calls to avpriv_report_missing_feature().
See: 435a730e21
See: 72cf47b241
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-10-26 02:46:40 +02:00
Michael Niedermayer
a665704402
Merge commit '4d6ee0725553a43ba88d6f8327ebcf8f1c5ae8d4'
...
* commit '4d6ee0725553a43ba88d6f8327ebcf8f1c5ae8d4':
libavutil: x86: Add AVX2 capable CPU detection.
Conflicts:
libavutil/cpu.c
libavutil/cpu.h
libavutil/x86/cpu.c
See: 865b70bc5d
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-10-26 02:36:36 +02:00
Kieran Kunhya
865b70bc5d
Add AVX2 capable CPU detection. Patch based on x264's AVX2 detection
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-10-26 02:34:22 +02:00
Michael Niedermayer
780669ef7c
avcodec/jpeg2000dec: non zero image offsets are not supported
...
Fixes out of array accesses
Fixes Ticket3080
Found-by: ami_stuff
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-10-26 02:19:13 +02:00
Lukasz Marek
c428170549
lavd/pulse_audio_enc: avoid vars in for()
...
Signed-off-by: Lukasz Marek <lukasz.m.luki@gmail.com>
2013-10-26 01:58:18 +02:00
Lukasz Marek
c6c70c2bf7
lavd/pulse_audio_enc: add another default to stream name
...
Signed-off-by: Lukasz Marek <lukasz.m.luki@gmail.com>
2013-10-26 01:58:01 +02:00
Michael Niedermayer
3c9dd93faa
h264: make flush_change() set mmco_reset
...
This ensures that frames do not get mixed on context reinits
Fixes Ticket2836
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-10-26 01:22:38 +02:00
lemonlinger@gmail.com
2cf94485de
avformat/rtpproto: when local rtp port and local rtcp port are not specified, try to make two successive ports and retry 3 times when failed
...
some video players on Android will not send udp hole punching messages if the rtcp port and rtp port are not two successive integers.
So, if the video player is behind NAT, it could not receive and rtp messages via udp
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-10-25 22:40:21 +02:00
Alex Converse
4e326ec769
fate: aac: Add test for AAC-ELD
2013-10-25 19:41:23 +00:00
Alex Converse
adea4512c6
aacdec: Fix calls to avpriv_report_missing_feature().
...
It does not take log level as an argument.
2013-10-25 19:41:23 +00:00
Kieran Kunhya
4d6ee07255
libavutil: x86: Add AVX2 capable CPU detection.
...
Patch based on x264's AVX2 detection
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
2013-10-25 19:36:55 +01:00
Michael Niedermayer
08a8976196
avcodec/h264: reduce noisiness of "mmco: unref short failure"
...
Do not consider it an error if we have no frames and should discard one.
This condition can easily happen when decoding is started from an I frame
Fixes Ticket2811
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-10-25 20:03:29 +02:00
Michael Niedermayer
ba8716df7f
avformat/mp3dec: perform seek resync in the correct direction
...
Fixes seeking to the last frame in CBR files
Fixes Ticket2773
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-10-25 19:37:03 +02:00
Michael Niedermayer
d04ec6ffc5
avformat/rmdec: english typos
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-10-25 19:14:36 +02:00
Michael Niedermayer
2e7a1fdd6d
avcodec/twinvq: return the actual number of consumed bytes
...
Fixes Ticket2980
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-10-25 17:25:26 +02:00
Michael Niedermayer
cbb7f56dfe
metasound & twinvqdec: return the number of read bytes from read_bitstream
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-10-25 17:24:07 +02:00
Michael Niedermayer
f5dae4894d
configure: abort if threading without atomics is used
...
also provide a list of workarounds to the user
Fixes Ticket2363
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-10-25 16:55:57 +02:00
Stefano Sabatini
b4991292aa
doc: add a few links to the Channel Layout syntax section
2013-10-25 15:44:12 +02:00
Stefano Sabatini
a3505136f9
doc/utils: document channel layout specification
2013-10-25 15:44:04 +02:00
Michael Niedermayer
d9ad305072
Merge remote-tracking branch 'qatar/master'
...
* qatar/master:
fft-test: Remove possibility of returning restricted exit code
dct-test: Remove possibility of returning a restricted exit code
base64-test: Remove posibility of returning restricted exit codes
tree-test: Don't return restricted exit codes
Conflicts:
libavutil/base64.c
See: b2fdf3fc35
See: f80ca1cb00
See: cbbd0ac764
See: 5dfdffeb6f
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-10-25 13:35:53 +02:00
Michael Niedermayer
6abb9eb525
avformat/wavdec: Fix smv packet interleaving
...
This strips the relative timestamp "flag" off.
Fixes Ticket2849
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-10-25 12:50:26 +02:00
Derek Buitenhuis
7177df90a0
fft-test: Remove possibility of returning restricted exit code
...
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
2013-10-25 11:06:43 +01:00
Derek Buitenhuis
5331d2b93f
dct-test: Remove possibility of returning a restricted exit code
...
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
2013-10-25 11:06:43 +01:00
Derek Buitenhuis
8dc1b7bd22
base64-test: Remove posibility of returning restricted exit codes
...
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
2013-10-25 11:06:32 +01:00
Michael Niedermayer
52297945ec
doc/issue_tracker: remove more mentions of patches
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-10-25 12:03:35 +02:00
Michael Niedermayer
cdb46f15ff
doc/issue_tracker: update resolution names
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-10-25 11:36:46 +02:00
Michael Niedermayer
2a28bad822
doc/issue_tracker: remove patches as we dont use trac to handle patches
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-10-25 11:36:29 +02:00
Michael Niedermayer
3db7ae6a9a
doc/issue_tracker: theres no substatus in trac
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-10-25 11:34:18 +02:00
Paul B Mahol
0f15ebe588
MAINTAINERS: update
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-10-25 07:12:32 +00:00
Michael Niedermayer
a443b9732f
ffmpeg: make stream default if its the only of its kind and no source can be unambigously assigned to it
...
Fixes Ticket2969
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-10-25 02:08:35 +02:00
Michael Niedermayer
4fb14f8492
avcodec/wmalosslessdec: fix data flushing at the end
...
Fixes ffplay -autoexit
Fixes Ticket3000
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-10-25 01:09:59 +02:00
Michael Niedermayer
29ffeef5e7
avcodec/h264: do not trust last_pic_droppable when marking pictures as done
...
This simplifies the code and fixes a deadlock
Fixes Ticket2927
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-10-24 23:15:30 +02:00
Michael Niedermayer
da54ad9a72
ffmpeg_filter: Pass command line -threads X to filtergraph
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-10-24 23:15:30 +02:00