Lukasz Marek
2f4233614a
ffserver_config: set defaults basing on absence of set value
...
This prevents the situation when user set option to 0 and ffserver
threats it as not set value, so applies the default.
Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com>
2014-12-02 21:58:34 +01:00
Lukasz Marek
c8ac46e924
ffserver_config: remove useless defaults
...
Options are already set to its defaults by AVOption API.
The only difference is for qmin, new default is 2, ffserver set to 3.
It is dead code because if condition is not meet unless user set option to 0.
Meeting condition would mean that ffserver overwrites explicity set option.
Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com>
2014-12-02 21:58:34 +01:00
Lukasz Marek
8b0226f2a6
ffserver: use avcodec_copy_context to copy context
...
Copying context using dedicated function is safer that raw memcpy
which creates shallow copy.
Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com>
2014-12-02 21:58:34 +01:00
Michael Niedermayer
d0b0fe6691
Merge commit '5639ed9abb58311f82cf3499b682d228290adb09'
...
* commit '5639ed9abb58311f82cf3499b682d228290adb09':
mov: do not truncate the language-prefixed tag
Conflicts:
libavformat/mov.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-12-02 21:45:44 +01:00
Michael Niedermayer
1537d0b432
Merge commit '604c9b1196c70d79bbbc1f23e75f6a8253a74da3'
...
* commit '604c9b1196c70d79bbbc1f23e75f6a8253a74da3':
rtsp: move the CONFIG_ macros to the beginning of the check
Conflicts:
libavformat/rtsp.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-12-02 21:39:05 +01:00
Michael Niedermayer
61d0a6dd95
Merge commit '7464e98f74c03d3efa0cdc8d7abad06e4c3c277a'
...
* commit '7464e98f74c03d3efa0cdc8d7abad06e4c3c277a':
aac: Simplify decode_mid_side_stereo
Conflicts:
libavcodec/aacdec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-12-02 21:29:48 +01:00
Michael Niedermayer
9adc999d2a
Merge remote-tracking branch 'cigaes/master'
...
* cigaes/master:
configure: add a note about pkg-config --static.
configure: add optional pkg-config helper and use it.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-12-02 19:48:04 +01:00
Michael Niedermayer
68b8e21b8b
avcodec/aacdec: Use avpriv_float_dsp_alloc()
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-12-02 19:32:45 +01:00
Michael Niedermayer
46b64e3098
Revert "avfilter/vf_interlace: more accurate pts calculation"
...
This reverts commit df8248f66e
.
the revert produces a timebase and timestamps that are more close
to what users expect
Hoped-by: koda
2014-12-02 18:48:03 +01:00
Nicolas George
6c96aa0606
configure: add a note about pkg-config --static.
...
Try to detect "$cc -static" without "pkg-config --static".
Also, when a library detection using pkg-config fails,
make it explicit this was pkg-config.
2014-12-02 18:43:54 +01:00
Nicolas George
cfcaf6b38e
configure: add optional pkg-config helper and use it.
...
The require variant dies if the package is not present.
The check variant does not import the flags to the used list.
The new variant imports the flags if the package is present
but does not die if it is not.
The new call graph is: require -> use -> check.
Use use_pkg_config for libx264 and libsmbclient: more readable
and three external call less per library.
2014-12-02 18:43:48 +01:00
Michael Niedermayer
59f1f764d6
avfilter/vf_tinterlace: Favor using standard timebases for the output
...
Reported-by: Vittorio Giovara <vittorio.giovara@gmail.com>
Inspired by discussion with Kieran Kunhya <kierank@obe.tv>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-12-02 18:28:06 +01:00
Rong Yan
b4d41beebe
avcodec/ppc/lossless_audiodsp_altivec: POWER LE support for scalarproduct_and_madd_int16_altivec()
...
adds macro GET_T()
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-12-02 17:13:47 +01:00
Florent Le Coz
2e0935965b
Drop the unofficial extension prefix for MPEG and MPEG-TS formats
...
As per the RFCs:
http://tools.ietf.org/html/rfc3555#page-38
http://tools.ietf.org/html/rfc3003
CC: libav-stable@libav.org
2014-12-02 15:28:22 +00:00
Jean-Baptiste Mardelle
7319a47c7e
mpegtsenc: recognize .mts as MPEG Transport Stream
2014-12-02 15:28:22 +00:00
Fredrik Axelsson
8f8caca224
Add support for BDAV/m2ts-mode muxing
...
Signed-off-by: Fredrik Axelsson <fraxbe@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-12-02 15:28:22 +00:00
Jon Morley
26e20dfd06
options_table: fix colorspace minimum option value
...
The min value for colorspace should be zero and not one since the first
valid index into the frame colorspace array is AVCOL_SPC_RGB which is 0.
2014-12-02 15:28:22 +00:00
Thilo Borgmann
3cec81f4d4
mov: allocate the tag value dynamically
...
This allows to load metadata entries longer than 1024 bytes.
Displaying them is still limited to 1024 characters, but applications
can load them fully now.
Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
2014-12-02 15:28:22 +00:00
Vittorio Giovara
e352b29371
mov: Add an option for exporting all metadata
2014-12-02 15:28:22 +00:00
Vittorio Giovara
5639ed9abb
mov: do not truncate the language-prefixed tag
2014-12-02 15:28:22 +00:00
Vittorio Giovara
604c9b1196
rtsp: move the CONFIG_ macros to the beginning of the check
...
With --disable-optimizations, the DCE of some compilers does not remove
such unused code, causing linking failure.
2014-12-02 15:28:22 +00:00
Luca Barbato
7464e98f74
aac: Simplify decode_mid_side_stereo
...
Might spare few cycles if the compiler is naive and
makes the function more readable.
2014-12-02 15:28:22 +00:00
Benoit Fouet
d7716961a8
avformat/apngdec: exit probing when skipping is not possible.
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-12-02 16:02:01 +01:00
Benoit Fouet
543fceba9c
apng: move shared header from avformat to avcodec.
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-12-02 15:52:31 +01:00
Carl Eugen Hoyos
f151f5415a
lavf/qcp: Print unknown GUID on error.
2014-12-02 11:40:01 +01:00
Carl Eugen Hoyos
7f6515e491
Also print GUIDs as shown in the Windows registry to ease debugging.
2014-12-02 11:39:06 +01:00
Carl Eugen Hoyos
ea5423a017
lavc/dirac_arith: Only compile x86 asm if ARCH_X86 is set.
...
Fixes ticket #3544 .
2014-12-02 11:36:48 +01:00
Michael Niedermayer
42801505cd
tests: Add vsynth2 which uses the new reference.pnm
...
The file is already present in git and by using it we can perform more tests
without the need of fate samples
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-12-02 03:39:56 +01:00
Michael Niedermayer
ed49b142bb
tests: Rename vsynth2 to vsynth_lena
...
This avoids confusion with a growing number of vsynth tests
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-12-02 03:02:30 +01:00
Michael Niedermayer
24e7e0237b
avformat/crypto: Use av_memdup()
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-12-02 02:01:11 +01:00
Christian Suloway
00d4013d9f
avformat/crypto: added encryption
...
Signed-off-by: Christian Suloway <csuloway@globaleagleent.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-12-02 01:46:10 +01:00
Christophe Gisquet
55a06b4619
doc: mention the noise_bsf parameter in the docs
...
This looks more like a seed than an amount, as the variable name
could lead to think.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-12-01 23:47:07 +01:00
Michael Niedermayer
9978916c53
Merge commit 'e4a77dc204f80a6876cbd91de9b71c30feebe119'
...
* commit 'e4a77dc204f80a6876cbd91de9b71c30feebe119':
Make the RELEASE file match with the most recent tag
Conflicts:
RELEASE
Not merged as the tag is not a FFmpeg version
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-12-01 21:33:07 +01:00
Michael Niedermayer
51f2422c2b
avcodec/vorbisdec: Use avpriv_float_dsp_alloc()
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-12-01 20:07:09 +01:00
Michael Niedermayer
00d4759134
avcodec/opus_celt: Use avpriv_float_dsp_alloc()
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-12-01 20:03:23 +01:00
Michael Niedermayer
3384d76503
avcodec/wmaprodec: Use avpriv_float_dsp_alloc()
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-12-01 18:07:59 +01:00
Michael Niedermayer
24fdf7334d
avformat/utils: Search harder for missing stream information in flv by default
...
Fixes Ticket4133
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-12-01 15:49:32 +01:00
Reinhard Tartler
e4a77dc204
Make the RELEASE file match with the most recent tag
2014-12-01 07:51:14 -05:00
Michael Niedermayer
b50e003e1c
avcodec/motion_est: use 2x8x8 for interlaced qpel
...
Fixes out of array read
Fixes Ticket4121
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-12-01 13:41:16 +01:00
Andreas Cadhalpun
928322c15f
doc: correct license template for t2h.pm
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-12-01 00:47:35 +01:00
Andreas Cadhalpun
b28652599d
doc: fix spelling errors
...
succesfully => successfully, reproducable => reproducible, specifiying => specifying, isnt => isn't, seperated => separated
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-12-01 00:31:06 +01:00
Michael Niedermayer
8653419e9d
avformat/mxfdec: Reset structural_components_count when allocation fails
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-11-30 23:25:19 +01:00
Mark Reid
e5d217f048
libavformat/mxfdec.c: initial support for EssenceGroups
...
Previous version reviewed-by: Tomas Härdin <tomas.hardin@codemill.se>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-11-30 23:14:06 +01:00
Michael Niedermayer
21c0c0f9d4
LICENSE.md: Add tests/reference.pnm
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-11-30 19:12:22 +01:00
Michael Niedermayer
d828b08143
Merge commit '8895bf7b78650c0c21c88cec0484e138ec511a4b'
...
* commit '8895bf7b78650c0c21c88cec0484e138ec511a4b':
Replace lena.pnm
Conflicts:
tests/Makefile
tests/ref/seek/vsynth2-asv1
tests/ref/seek/vsynth2-asv2
tests/ref/seek/vsynth2-ffv1
tests/ref/seek/vsynth2-flashsv
tests/ref/seek/vsynth2-flv
tests/ref/seek/vsynth2-h261
tests/ref/seek/vsynth2-h263
tests/ref/seek/vsynth2-h263p
tests/ref/seek/vsynth2-huffyuv
tests/ref/seek/vsynth2-ljpeg
tests/ref/seek/vsynth2-mjpeg
tests/ref/seek/vsynth2-mpeg1
tests/ref/seek/vsynth2-mpeg1b
tests/ref/seek/vsynth2-mpeg2-422
tests/ref/seek/vsynth2-mpeg2-idct-int
tests/ref/seek/vsynth2-mpeg2-ilace
tests/ref/seek/vsynth2-mpeg2-ivlc-qprd
tests/ref/seek/vsynth2-mpeg2-thread
tests/ref/seek/vsynth2-mpeg2-thread-ivlc
tests/ref/seek/vsynth2-mpeg4
tests/ref/seek/vsynth2-mpeg4-adap
tests/ref/seek/vsynth2-mpeg4-error
tests/ref/seek/vsynth2-mpeg4-nr
tests/ref/seek/vsynth2-mpeg4-qpel
tests/ref/seek/vsynth2-mpeg4-qprd
tests/ref/seek/vsynth2-mpeg4-rc
tests/ref/seek/vsynth2-mpeg4-thread
tests/ref/seek/vsynth2-msmpeg4
tests/ref/seek/vsynth2-msmpeg4v2
tests/ref/seek/vsynth2-roqvideo
tests/ref/seek/vsynth2-rv10
tests/ref/seek/vsynth2-rv20
tests/ref/seek/vsynth2-svq1
tests/ref/seek/vsynth2-wmv1
tests/ref/seek/vsynth2-wmv2
tests/ref/vsynth/vsynth2-asv1
tests/ref/vsynth/vsynth2-asv2
tests/ref/vsynth/vsynth2-cljr
tests/ref/vsynth/vsynth2-dnxhd-1080i
tests/ref/vsynth/vsynth2-dnxhd-720p
tests/ref/vsynth/vsynth2-dnxhd-720p-10bit
tests/ref/vsynth/vsynth2-dnxhd-720p-rd
tests/ref/vsynth/vsynth2-dv
tests/ref/vsynth/vsynth2-dv-411
tests/ref/vsynth/vsynth2-dv-50
tests/ref/vsynth/vsynth2-ffv1
tests/ref/vsynth/vsynth2-ffvhuff
tests/ref/vsynth/vsynth2-flashsv
tests/ref/vsynth/vsynth2-flv
tests/ref/vsynth/vsynth2-h261
tests/ref/vsynth/vsynth2-h263
tests/ref/vsynth/vsynth2-h263-obmc
tests/ref/vsynth/vsynth2-h263p
tests/ref/vsynth/vsynth2-huffyuv
tests/ref/vsynth/vsynth2-jpegls
tests/ref/vsynth/vsynth2-ljpeg
tests/ref/vsynth/vsynth2-mjpeg
tests/ref/vsynth/vsynth2-mpeg1
tests/ref/vsynth/vsynth2-mpeg1b
tests/ref/vsynth/vsynth2-mpeg2
tests/ref/vsynth/vsynth2-mpeg2-422
tests/ref/vsynth/vsynth2-mpeg2-idct-int
tests/ref/vsynth/vsynth2-mpeg2-ilace
tests/ref/vsynth/vsynth2-mpeg2-ivlc-qprd
tests/ref/vsynth/vsynth2-mpeg2-thread
tests/ref/vsynth/vsynth2-mpeg2-thread-ivlc
tests/ref/vsynth/vsynth2-mpeg4
tests/ref/vsynth/vsynth2-mpeg4-adap
tests/ref/vsynth/vsynth2-mpeg4-adv
tests/ref/vsynth/vsynth2-mpeg4-error
tests/ref/vsynth/vsynth2-mpeg4-nr
tests/ref/vsynth/vsynth2-mpeg4-qpel
tests/ref/vsynth/vsynth2-mpeg4-qprd
tests/ref/vsynth/vsynth2-mpeg4-rc
tests/ref/vsynth/vsynth2-mpeg4-thread
tests/ref/vsynth/vsynth2-msmpeg4
tests/ref/vsynth/vsynth2-msmpeg4v2
tests/ref/vsynth/vsynth2-prores
tests/ref/vsynth/vsynth2-qtrle
tests/ref/vsynth/vsynth2-rgb
tests/ref/vsynth/vsynth2-roqvideo
tests/ref/vsynth/vsynth2-rv10
tests/ref/vsynth/vsynth2-rv20
tests/ref/vsynth/vsynth2-svq1
tests/ref/vsynth/vsynth2-v210
tests/ref/vsynth/vsynth2-wmv1
tests/ref/vsynth/vsynth2-wmv2
tests/ref/vsynth/vsynth2-yuv
See: c4abee734d
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-11-30 18:39:21 +01:00
Michael Niedermayer
7944065114
Merge commit '0f257e29c5520b215e573e7e3abde8e5a4743309'
...
* commit '0f257e29c5520b215e573e7e3abde8e5a4743309':
Treat all '*.pnm' files as non-text file
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-11-30 18:18:20 +01:00
Christophe Gisquet
4c592c3908
ffmpeg: take bsf arguments from the command line
...
The format is now:
-bsf:X filter1[=opt1=str1/opt2=str2],filter2
ie the parameters are appended after the filter name using '='. As ','
has been reserved already for the list of filters, '/' is just an
example of token separation for now, but that could become part of the
API to avoid each bsf using its own tokenization.
The proper solution would be using AVOption, but this is overkill for now.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-11-30 13:11:34 +01:00
Michael Niedermayer
0b5adc3520
avcodec/adxenc: fix rounding
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-11-30 12:56:02 +01:00
Michael Niedermayer
6b0ab561d0
avcodec/adxenc: match prediction used in the decoder
...
The prediction used in the encoder was not correct
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-11-30 12:52:56 +01:00
Michael Niedermayer
93f959b672
avcodec/atrac3: Use avpriv_float_dsp_alloc()
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-11-30 11:23:34 +01:00