ffmpeg.git
5 years agoavformat/md5enc: add format, version and column headers
Michael Niedermayer [Sun, 20 Oct 2013 20:53:02 +0000 (22:53 +0200)]
avformat/md5enc: add format, version and column headers

See Ticket2280

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agodoc/issue_tracker: add 2 missing issue types
Michael Niedermayer [Fri, 25 Oct 2013 09:41:43 +0000 (11:41 +0200)]
doc/issue_tracker: add 2 missing issue types

Reviewed-by: Lou Logan <lou@lrcd.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge remote-tracking branch 'lukaszmluki/master'
Michael Niedermayer [Sat, 26 Oct 2013 08:30:59 +0000 (10:30 +0200)]
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>
5 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Sat, 26 Oct 2013 00:47:53 +0000 (02:47 +0200)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  fate: aac: Add test for AAC-ELD

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit 'adea4512c6087280702e2423de55cea050e20a98'
Michael Niedermayer [Sat, 26 Oct 2013 00:46:34 +0000 (02:46 +0200)]
Merge commit 'adea4512c6087280702e2423de55cea050e20a98'

* commit 'adea4512c6087280702e2423de55cea050e20a98':
  aacdec: Fix calls to avpriv_report_missing_feature().

See: 435a730e2190c9b005117eaad57f7559cd82581c
See: 72cf47b241c7972cce313e1f474bdb8f3684fa15

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '4d6ee0725553a43ba88d6f8327ebcf8f1c5ae8d4'
Michael Niedermayer [Sat, 26 Oct 2013 00:36:20 +0000 (02:36 +0200)]
Merge commit '4d6ee0725553a43ba88d6f8327ebcf8f1c5ae8d4'

* commit '4d6ee0725553a43ba88d6f8327ebcf8f1c5ae8d4':
  libavutil: x86: Add AVX2 capable CPU detection.

Conflicts:
libavutil/cpu.c
libavutil/cpu.h
libavutil/x86/cpu.c

See: 865b70bc5d1cf37ec6d6cb729a69dda2cca28bd5
Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoAdd AVX2 capable CPU detection. Patch based on x264's AVX2 detection
Kieran Kunhya [Sun, 20 Oct 2013 15:28:38 +0000 (10:28 -0500)]
Add AVX2 capable CPU detection. Patch based on x264's AVX2 detection

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/jpeg2000dec: non zero image offsets are not supported
Michael Niedermayer [Sat, 26 Oct 2013 00:19:13 +0000 (02:19 +0200)]
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>
5 years agolavd/pulse_audio_enc: avoid vars in for()
Lukasz Marek [Fri, 25 Oct 2013 23:42:11 +0000 (01:42 +0200)]
lavd/pulse_audio_enc: avoid vars in for()

Signed-off-by: Lukasz Marek <lukasz.m.luki@gmail.com>
5 years agolavd/pulse_audio_enc: add another default to stream name
Lukasz Marek [Thu, 24 Oct 2013 16:10:06 +0000 (18:10 +0200)]
lavd/pulse_audio_enc: add another default to stream name

Signed-off-by: Lukasz Marek <lukasz.m.luki@gmail.com>
5 years agoh264: make flush_change() set mmco_reset
Michael Niedermayer [Fri, 25 Oct 2013 23:22:38 +0000 (01:22 +0200)]
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>
5 years agoavformat/rtpproto: when local rtp port and local rtcp port are not specified, try...
lemonlinger@gmail.com [Sun, 20 Oct 2013 08:53:09 +0000 (16:53 +0800)]
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>
5 years agofate: aac: Add test for AAC-ELD
Alex Converse [Tue, 22 Oct 2013 10:04:47 +0000 (10:04 +0000)]
fate: aac: Add test for AAC-ELD

5 years agoaacdec: Fix calls to avpriv_report_missing_feature().
Alex Converse [Fri, 25 Oct 2013 18:13:13 +0000 (18:13 +0000)]
aacdec: Fix calls to avpriv_report_missing_feature().

It does not take log level as an argument.

5 years agolibavutil: x86: Add AVX2 capable CPU detection.
Kieran Kunhya [Fri, 25 Oct 2013 12:53:56 +0000 (07:53 -0500)]
libavutil: x86: Add AVX2 capable CPU detection.

Patch based on x264's AVX2 detection

Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
5 years agoavcodec/h264: reduce noisiness of "mmco: unref short failure"
Michael Niedermayer [Fri, 25 Oct 2013 18:03:29 +0000 (20:03 +0200)]
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>
5 years agoavformat/mp3dec: perform seek resync in the correct direction
Michael Niedermayer [Fri, 25 Oct 2013 17:35:55 +0000 (19:35 +0200)]
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>
5 years agoavformat/rmdec: english typos
Michael Niedermayer [Fri, 25 Oct 2013 17:14:36 +0000 (19:14 +0200)]
avformat/rmdec: english typos

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/twinvq: return the actual number of consumed bytes
Michael Niedermayer [Fri, 25 Oct 2013 15:25:26 +0000 (17:25 +0200)]
avcodec/twinvq: return the actual number of consumed bytes

Fixes Ticket2980

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agometasound & twinvqdec: return the number of read bytes from read_bitstream
Michael Niedermayer [Fri, 25 Oct 2013 15:23:13 +0000 (17:23 +0200)]
metasound & twinvqdec: return the number of read bytes from read_bitstream

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoconfigure: abort if threading without atomics is used
Michael Niedermayer [Fri, 25 Oct 2013 14:54:45 +0000 (16:54 +0200)]
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>
5 years agodoc: add a few links to the Channel Layout syntax section
Stefano Sabatini [Fri, 25 Oct 2013 13:41:35 +0000 (15:41 +0200)]
doc: add a few links to the Channel Layout syntax section

5 years agodoc/utils: document channel layout specification
Stefano Sabatini [Fri, 18 Oct 2013 09:21:21 +0000 (11:21 +0200)]
doc/utils: document channel layout specification

5 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Fri, 25 Oct 2013 11:34:58 +0000 (13:34 +0200)]
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: b2fdf3fc35b6dca8ac7f6d46bd73ea5eb1339193
See: f80ca1cb002c53927fa3edaff5082bfba24d6193
See: cbbd0ac764b43df081898a2c3548a2fee1faca53
See: 5dfdffeb6fe9c43a496a4c1949cf9162474c7418
Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavformat/wavdec: Fix smv packet interleaving
Michael Niedermayer [Fri, 25 Oct 2013 10:50:26 +0000 (12:50 +0200)]
avformat/wavdec: Fix smv packet interleaving

This strips the relative timestamp "flag" off.

Fixes Ticket2849

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agofft-test: Remove possibility of returning restricted exit code
Derek Buitenhuis [Tue, 22 Oct 2013 18:19:02 +0000 (19:19 +0100)]
fft-test: Remove possibility of returning restricted exit code

Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
5 years agodct-test: Remove possibility of returning a restricted exit code
Derek Buitenhuis [Tue, 22 Oct 2013 18:18:36 +0000 (19:18 +0100)]
dct-test: Remove possibility of returning a restricted exit code

Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
5 years agobase64-test: Remove posibility of returning restricted exit codes
Derek Buitenhuis [Tue, 22 Oct 2013 18:11:31 +0000 (19:11 +0100)]
base64-test: Remove posibility of returning restricted exit codes

Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
5 years agodoc/issue_tracker: remove more mentions of patches
Michael Niedermayer [Fri, 25 Oct 2013 10:03:35 +0000 (12:03 +0200)]
doc/issue_tracker: remove more mentions of patches

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agodoc/issue_tracker: update resolution names
Michael Niedermayer [Fri, 25 Oct 2013 09:36:46 +0000 (11:36 +0200)]
doc/issue_tracker: update resolution names

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agodoc/issue_tracker: remove patches as we dont use trac to handle patches
Michael Niedermayer [Fri, 25 Oct 2013 09:34:27 +0000 (11:34 +0200)]
doc/issue_tracker: remove patches as we dont use trac to handle patches

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agodoc/issue_tracker: theres no substatus in trac
Michael Niedermayer [Fri, 25 Oct 2013 09:32:42 +0000 (11:32 +0200)]
doc/issue_tracker: theres no substatus in trac

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMAINTAINERS: update
Paul B Mahol [Fri, 25 Oct 2013 07:12:32 +0000 (07:12 +0000)]
MAINTAINERS: update

Signed-off-by: Paul B Mahol <onemda@gmail.com>
5 years agoffmpeg: make stream default if its the only of its kind and no source can be unambigo...
Michael Niedermayer [Fri, 25 Oct 2013 00:08:35 +0000 (02:08 +0200)]
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>
5 years agoavcodec/wmalosslessdec: fix data flushing at the end
Michael Niedermayer [Thu, 24 Oct 2013 23:09:59 +0000 (01:09 +0200)]
avcodec/wmalosslessdec: fix data flushing at the end

Fixes ffplay -autoexit
Fixes Ticket3000

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/h264: do not trust last_pic_droppable when marking pictures as done
Michael Niedermayer [Thu, 24 Oct 2013 21:11:41 +0000 (23:11 +0200)]
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>
5 years agoffmpeg_filter: Pass command line -threads X to filtergraph
Michael Niedermayer [Thu, 24 Oct 2013 20:00:37 +0000 (22:00 +0200)]
ffmpeg_filter: Pass command line -threads X to filtergraph

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agolavd/fbdev_common: fix compilation with older kernels
Ingo Brückl [Thu, 24 Oct 2013 18:26:36 +0000 (20:26 +0200)]
lavd/fbdev_common: fix compilation with older kernels

This will avoid errors due to conflicting declarations
with linux kernels prior to 2.6.30.

Reviewed-by: Lukasz M <lukasz.m.luki@gmail.com>
Signed-off-by: Ingo Brückl <ib@wupperonline.de>
5 years agodoc/Makefile: fix man pages uninstall path
Stefano Sabatini [Thu, 24 Oct 2013 19:14:55 +0000 (21:14 +0200)]
doc/Makefile: fix man pages uninstall path

Fix trac ticket #3054.

5 years agodoc/protocols: add description for the RTP protocol
burek [Thu, 24 Oct 2013 09:37:57 +0000 (11:37 +0200)]
doc/protocols: add description for the RTP protocol

With some edits by Stefano.

Signed-off-by: Stefano Sabatini <stefasab@gmail.com>
5 years agoavcodec/flicvideo: use avpriv_request_sample()
Paul B Mahol [Thu, 24 Oct 2013 15:31:35 +0000 (15:31 +0000)]
avcodec/flicvideo: use avpriv_request_sample()

Signed-off-by: Paul B Mahol <onemda@gmail.com>
5 years agoavformat/rmdec: add some error messages
Michael Niedermayer [Thu, 24 Oct 2013 15:05:57 +0000 (17:05 +0200)]
avformat/rmdec: add some error messages

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavformat/rmdec: fix return code of ff_rm_parse_packet()
Michael Niedermayer [Thu, 24 Oct 2013 14:53:50 +0000 (16:53 +0200)]
avformat/rmdec: fix return code of ff_rm_parse_packet()

Broken by aecb9d3
Fixes assertion failure
Fixes Ticket3042

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/x86/videodsp: Properly mark sse2 instructions in emulated_edge_mc x86 simd...
Ronald S. Bultje [Thu, 24 Oct 2013 10:54:32 +0000 (06:54 -0400)]
avcodec/x86/videodsp: Properly mark sse2 instructions in emulated_edge_mc x86 simd as such.

Should fix crashes or corrupt output on pre-SSE2 CPUs when they were
using SSE2-code (e.g. AMD Athlon XP 2400+ or Intel Pentium III) in
hfix or hvar single-edge (left/right) extension functions.

Tested-by: Ingo Brückl <ib@wupperonline.de>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavformat/utils: Check size argument in ff_add_index_entry()
Michael Niedermayer [Thu, 24 Oct 2013 00:29:50 +0000 (02:29 +0200)]
avformat/utils: Check size argument in ff_add_index_entry()

Fixes infinite loop
Fixes Ticket3061

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge remote-tracking branch 'cehoyos/master'
Michael Niedermayer [Thu, 24 Oct 2013 10:18:14 +0000 (12:18 +0200)]
Merge remote-tracking branch 'cehoyos/master'

* cehoyos/master:
  lavd/x11grab: Support AV_PIX_FMT_PAL8.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavfilter/x86/vf_gradfun_init: fix const and related warnings
Michael Niedermayer [Thu, 24 Oct 2013 10:12:04 +0000 (12:12 +0200)]
avfilter/x86/vf_gradfun_init: fix const and related warnings

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agotree-test: Don't return restricted exit codes
Derek Buitenhuis [Tue, 22 Oct 2013 18:08:43 +0000 (19:08 +0100)]
tree-test: Don't return restricted exit codes

Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
5 years agolavd/x11grab: Support AV_PIX_FMT_PAL8.
Carl Eugen Hoyos [Thu, 24 Oct 2013 09:10:49 +0000 (11:10 +0200)]
lavd/x11grab: Support AV_PIX_FMT_PAL8.

Fixes ticket #3068.

5 years agofft-test: Remove possibility of returning restricted exit code
Derek Buitenhuis [Tue, 22 Oct 2013 18:19:02 +0000 (19:19 +0100)]
fft-test: Remove possibility of returning restricted exit code

Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
5 years agodct-test: Remove possibility of returning a restricted exit code
Derek Buitenhuis [Tue, 22 Oct 2013 18:18:36 +0000 (19:18 +0100)]
dct-test: Remove possibility of returning a restricted exit code

Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
5 years agobase64-test: Remove posibility of returning restrcted exit codes
Derek Buitenhuis [Tue, 22 Oct 2013 18:11:31 +0000 (19:11 +0100)]
base64-test: Remove posibility of returning restrcted exit codes

Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
5 years agotree-test: Don't return restricted exit codes
Derek Buitenhuis [Tue, 22 Oct 2013 18:08:43 +0000 (19:08 +0100)]
tree-test: Don't return restricted exit codes

Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
5 years agobuild: remove pointless condition
Ingo Brückl [Thu, 24 Oct 2013 00:18:19 +0000 (02:18 +0200)]
build: remove pointless condition

$(STRIP) always expands to something, because it is one of the commands
in the BRIEF list. This renders the condition pointless.

Signed-off-by: Ingo Brückl <ib@wupperonline.de>
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
5 years agolavc/libmp3lame: add comments about CBR/VBR modes
Timothy Gu [Thu, 24 Oct 2013 03:57:36 +0000 (20:57 -0700)]
lavc/libmp3lame: add comments about CBR/VBR modes

Signed-off-by: Timothy Gu <timothygu99@gmail.com>
Signed-off-by: Stefano Sabatini <stefasab@gmail.com>
5 years agolavc/libmp3lame: fix alignment and capitalization in AVOptions
Timothy Gu [Thu, 24 Oct 2013 03:55:29 +0000 (20:55 -0700)]
lavc/libmp3lame: fix alignment and capitalization in AVOptions

Signed-off-by: Timothy Gu <timothygu99@gmail.com>
Signed-off-by: Stefano Sabatini <stefasab@gmail.com>
5 years agodoc/codecs: update skip_alpha documentation
Timothy Gu [Sat, 19 Oct 2013 00:56:14 +0000 (17:56 -0700)]
doc/codecs: update skip_alpha documentation

Merged-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: Timothy Gu <timothygu99@gmail.com>
Signed-off-by: Stefano Sabatini <stefasab@gmail.com>
5 years agodoc/encoders: add libvorbis doc
Timothy Gu [Thu, 17 Oct 2013 03:33:48 +0000 (20:33 -0700)]
doc/encoders: add libvorbis doc

Signed-off-by: Timothy Gu <timothygu99@gmail.com>
Signed-off-by: Stefano Sabatini <stefasab@gmail.com>
5 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Thu, 24 Oct 2013 08:44:42 +0000 (10:44 +0200)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  golomb: reduce scope of a few variables

Conflicts:
libavcodec/golomb.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '0e730494160d973400aed8d2addd1f58a0ec883e'
Michael Niedermayer [Thu, 24 Oct 2013 08:32:17 +0000 (10:32 +0200)]
Merge commit '0e730494160d973400aed8d2addd1f58a0ec883e'

* commit '0e730494160d973400aed8d2addd1f58a0ec883e':
  avfilter: x86: Port gradfun filter optimizations to yasm

Conflicts:
libavfilter/x86/vf_gradfun_init.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavdevice/fbdev_enc: avoid declaring variables in for()
Michael Niedermayer [Thu, 24 Oct 2013 08:18:17 +0000 (10:18 +0200)]
avdevice/fbdev_enc: avoid declaring variables in for()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavfilter/libmpcodecs/vf_eq: remove useless storage class specifier in empty declaration
Paul B Mahol [Thu, 24 Oct 2013 07:44:23 +0000 (07:44 +0000)]
avfilter/libmpcodecs/vf_eq: remove useless storage class specifier in empty declaration

Signed-off-by: Paul B Mahol <onemda@gmail.com>
5 years agolavd/fbdev: move common code to separate file
Lukasz Marek [Sat, 19 Oct 2013 19:12:51 +0000 (21:12 +0200)]
lavd/fbdev: move common code to separate file

Move common fbdev dec/enc for separate file.

Signed-off-by: Lukasz Marek <lukasz.m.luki@gmail.com>
Signed-off-by: Stefano Sabatini <stefasab@gmail.com>
5 years agolavd: rename fbdev.c into fbdev_dec.c
Lukasz Marek [Sat, 19 Oct 2013 19:38:38 +0000 (21:38 +0200)]
lavd: rename fbdev.c into fbdev_dec.c

Rename existing fbdev.c to make it a more meaningful name.

Signed-off-by: Lukasz Marek <lukasz.m.luki@gmail.com>
Signed-off-by: Stefano Sabatini <stefasab@gmail.com>
5 years agolavd: add fbdev output device
Lukasz Marek [Wed, 16 Oct 2013 15:18:55 +0000 (17:18 +0200)]
lavd: add fbdev output device

Signed-off-by: Lukasz Marek <lukasz.m.luki@gmail.com>
Signed-off-by: Stefano Sabatini <stefasab@gmail.com>
5 years agolsws: use av_pix_fmt_get_chroma_sub_sample()
Stefano Sabatini [Mon, 21 Oct 2013 13:57:07 +0000 (15:57 +0200)]
lsws: use av_pix_fmt_get_chroma_sub_sample()

Remove duplicated getSubSampleFactors() function. Simplify.

5 years agogolomb: reduce scope of a few variables
Vittorio Giovara [Wed, 23 Oct 2013 13:43:19 +0000 (15:43 +0200)]
golomb: reduce scope of a few variables

Signed-off-by: Diego Biurrun <diego@biurrun.de>
5 years agoavcodec/mpegaudio_tablegen: fix build with hardcoded tables
Michael Niedermayer [Wed, 23 Oct 2013 23:18:37 +0000 (01:18 +0200)]
avcodec/mpegaudio_tablegen: fix build with hardcoded tables

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/metasound_data: Fix inconsistency in tables
Michael Niedermayer [Tue, 22 Oct 2013 15:29:40 +0000 (17:29 +0200)]
avcodec/metasound_data: Fix inconsistency in tables

Fixes out of array read

This issue can be reproduced with:
Lucky.asf
teuflisch.asf
from http://samples.ffmpeg.org/A-codecs/VoxWare/

as well as other samples

fcb16m has 320 elements but the code before the patch can address a
table of 384 elements in its place.
I dont know if theres some elements missing, or its maybe the wrong
table, or if the parameters affecting the table size are wrong, or
if theres something else wrong.
if someone reading this has easy access to some reference. (binary
with the tables in it, spec, whatever, please contact us)

This solution fixes the inconsistency by padding the table with zeros,
this variant was suggested by Vitor Sessak. And ensures that nothing
currently working breaks.

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/hevc: remove CODEC_CAP_EXPERIMENTAL
Michael Niedermayer [Wed, 23 Oct 2013 17:52:18 +0000 (19:52 +0200)]
avcodec/hevc: remove CODEC_CAP_EXPERIMENTAL

Approved-by: mraulet
Approved-by: smarter
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Wed, 23 Oct 2013 17:45:07 +0000 (19:45 +0200)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  golomb: K&R formatting cosmetics

Conflicts:
libavcodec/golomb.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '1ce3ec24b35d9d549b12f17bd7fd391abaf3a6f7'
Michael Niedermayer [Wed, 23 Oct 2013 17:26:59 +0000 (19:26 +0200)]
Merge commit '1ce3ec24b35d9d549b12f17bd7fd391abaf3a6f7'

* commit '1ce3ec24b35d9d549b12f17bd7fd391abaf3a6f7':
  h263: K&R formatting cosmetics

Conflicts:
libavcodec/h263dec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agofate: fix fieldorder test
Paul B Mahol [Wed, 23 Oct 2013 17:35:37 +0000 (17:35 +0000)]
fate: fix fieldorder test

Signed-off-by: Paul B Mahol <onemda@gmail.com>
5 years agoMerge commit '0d6d4a9e4a626be6ff55839eab4114aeac45ba88'
Michael Niedermayer [Wed, 23 Oct 2013 16:52:03 +0000 (18:52 +0200)]
Merge commit '0d6d4a9e4a626be6ff55839eab4114aeac45ba88'

* commit '0d6d4a9e4a626be6ff55839eab4114aeac45ba88':
  avstring-test: Mark pointer passed to av_free() as non-const

See: ab796ded757e616cb9167c0a15d70903b86e00f9
Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavutil/log: document log callback thread saftey requirements
Michael Niedermayer [Wed, 16 Oct 2013 23:40:19 +0000 (01:40 +0200)]
avutil/log: document log callback thread saftey requirements

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavutil/log: make default av_log callback thread safe
Michael Niedermayer [Wed, 16 Oct 2013 21:23:18 +0000 (23:23 +0200)]
avutil/log: make default av_log callback thread safe

This uses a pthread mutex

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/utils: use a default lock manager that uses a pthread mutex
Michael Niedermayer [Thu, 17 Oct 2013 13:32:03 +0000 (15:32 +0200)]
avcodec/utils: use a default lock manager that uses a pthread mutex

That makes avformat & avcodec thread safe without the need to explicitly
register a lock manager.

Reviewed-by: wm4 <nfxjfg@googlemail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavformat/framehash: add software version to framecrc/md5
Michael Niedermayer [Sun, 20 Oct 2013 20:23:08 +0000 (22:23 +0200)]
avformat/framehash: add software version to framecrc/md5

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agolavf/adtsenc: Add support for APE tags
James Almer [Thu, 11 Jul 2013 23:40:17 +0000 (20:40 -0300)]
lavf/adtsenc: Add support for APE tags

Should fix ticket #2269

Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavfilter/vf_scale: Correct vf_scale mappings from arguments to color range
Robert Krüger [Wed, 23 Oct 2013 10:50:07 +0000 (12:50 +0200)]
avfilter/vf_scale: Correct vf_scale mappings from arguments to color range

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavfilter: x86: Port gradfun filter optimizations to yasm
Daniel Kang [Tue, 22 Oct 2013 00:37:46 +0000 (20:37 -0400)]
avfilter: x86: Port gradfun filter optimizations to yasm

Signed-off-by: Diego Biurrun <diego@biurrun.de>
5 years agoavcodec/vc1dec: use logical operation instead of bitwise for twomv
Michael Niedermayer [Sat, 19 Oct 2013 22:00:36 +0000 (00:00 +0200)]
avcodec/vc1dec: use logical operation instead of bitwise for twomv

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agofix order of operations in comments
Michael Niedermayer [Sat, 19 Oct 2013 21:49:37 +0000 (23:49 +0200)]
fix order of operations in comments

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agogolomb: K&R formatting cosmetics
Vittorio Giovara [Tue, 22 Oct 2013 11:12:49 +0000 (13:12 +0200)]
golomb: K&R formatting cosmetics

Signed-off-by: Diego Biurrun <diego@biurrun.de>
5 years agoh263: K&R formatting cosmetics
Luca Barbato [Tue, 22 Oct 2013 17:37:44 +0000 (19:37 +0200)]
h263: K&R formatting cosmetics

Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
Signed-off-by: Diego Biurrun <diego@biurrun.de>
5 years agoavstring-test: Mark pointer passed to av_free() as non-const
Diego Biurrun [Sat, 19 Oct 2013 14:12:49 +0000 (16:12 +0200)]
avstring-test: Mark pointer passed to av_free() as non-const

libavutil/avstring.c:278:9: warning: passing argument 1 of ‘av_free’ discards ‘const’ qualifier from pointer target type

5 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Wed, 23 Oct 2013 11:04:30 +0000 (13:04 +0200)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  mpegvideo: Drop a faulty assert

Conflicts:
libavcodec/mpegvideo.c

Merge for metadata only, the change looks wrong.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit 'f6633c55a3c0e93a5b2bab6aa0692fb608f2a38d'
Michael Niedermayer [Wed, 23 Oct 2013 10:13:38 +0000 (12:13 +0200)]
Merge commit 'f6633c55a3c0e93a5b2bab6aa0692fb608f2a38d'

* commit 'f6633c55a3c0e93a5b2bab6aa0692fb608f2a38d':
  avfilter: Fix typo in Loren's email address

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit 'e01fba5562133ac56a4f44c6f214a80ee33cb388'
Michael Niedermayer [Wed, 23 Oct 2013 10:02:05 +0000 (12:02 +0200)]
Merge commit 'e01fba5562133ac56a4f44c6f214a80ee33cb388'

* commit 'e01fba5562133ac56a4f44c6f214a80ee33cb388':
  movenc: Add an F4V muxer

Conflicts:
Changelog
libavformat/allformats.c
libavformat/movenc.c
libavformat/version.h

See: 7bc70930ddc487712419e65ebca4d77868a20ffb
Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoffmpeg: Dont crash on unconnected output pads before an error is printed
Michael Niedermayer [Wed, 23 Oct 2013 09:39:43 +0000 (11:39 +0200)]
ffmpeg: Dont crash on unconnected output pads before an error is printed

Found-by: durandal_1707
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/aacdec: fix more avpriv_report_missing_feature() arguments
Michael Niedermayer [Wed, 23 Oct 2013 08:44:18 +0000 (10:44 +0200)]
avcodec/aacdec: fix more avpriv_report_missing_feature() arguments

Found-by: durandal_1707
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agompegvideo: Drop a faulty assert
Luca Barbato [Tue, 22 Oct 2013 17:17:10 +0000 (19:17 +0200)]
mpegvideo: Drop a faulty assert

That check is easily reachable by faulty input.

CC:libav-stable@libav.org
Reported-by: Torsten Sadowski <tsadowski@gmx.net>
5 years agoavcodec/aacdec: fix avpriv_report_missing_feature() arguments
Michael Niedermayer [Wed, 23 Oct 2013 08:44:18 +0000 (10:44 +0200)]
avcodec/aacdec: fix avpriv_report_missing_feature() arguments

Found-by: durandal_1707
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavfilter: Fix typo in Loren's email address
Diego Biurrun [Mon, 21 Oct 2013 20:35:02 +0000 (22:35 +0200)]
avfilter: Fix typo in Loren's email address

5 years agomovenc: Add an F4V muxer
Clément Bœsch [Mon, 17 Sep 2012 14:16:16 +0000 (16:16 +0200)]
movenc: Add an F4V muxer

F4V is Adobe's mp4/iso media variant, with the most significant
addition/change being supporting other flash codecs than just
aac/h264.

Signed-off-by: Martin Storsjö <martin@martin.st>
5 years agoswscale/utils: check mprotect() return code
Michael Niedermayer [Wed, 23 Oct 2013 08:14:05 +0000 (10:14 +0200)]
swscale/utils: check mprotect() return code

Found-by: wm4
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Wed, 23 Oct 2013 08:02:43 +0000 (10:02 +0200)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  aac: Add support for Enhanced AAC Low Delay (ER AAC ELD).

Conflicts:
Changelog
libavcodec/aacdec.c
libavcodec/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit 'f457edb69794c7e13b3630456d72f7942fff19f7'
Michael Niedermayer [Wed, 23 Oct 2013 07:53:52 +0000 (09:53 +0200)]
Merge commit 'f457edb69794c7e13b3630456d72f7942fff19f7'

* commit 'f457edb69794c7e13b3630456d72f7942fff19f7':
  aacdec: Use avpriv_report_missing_feature() instead of custom logging.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit 'b1fcdc08ceb5df69fac34aa0d57c56905d32b8b4'
Michael Niedermayer [Wed, 23 Oct 2013 07:47:41 +0000 (09:47 +0200)]
Merge commit 'b1fcdc08ceb5df69fac34aa0d57c56905d32b8b4'

* commit 'b1fcdc08ceb5df69fac34aa0d57c56905d32b8b4':
  nut: Fix unchecked allocations

Conflicts:
libavformat/nut.c
libavformat/nutdec.c
libavformat/nutenc.c

See: 55ae13e3deffa21027a44f31b4ae2f53a4fa7426
Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '3511d4fc9784d5fbb024dce68ca7a0d7fdd74663'
Michael Niedermayer [Wed, 23 Oct 2013 07:26:57 +0000 (09:26 +0200)]
Merge commit '3511d4fc9784d5fbb024dce68ca7a0d7fdd74663'

* commit '3511d4fc9784d5fbb024dce68ca7a0d7fdd74663':
  pthread: Avoid crashes/odd behavior caused by spurious wakeups

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