Michael Niedermayer
1904704a48
Merge commit 'faab8f9fcb4ffeb967dc6872c0f1e9da719106ce'
...
* commit 'faab8f9fcb4ffeb967dc6872c0f1e9da719106ce':
configure: move cross_compile checks after the toolchain section
Conflicts:
configure
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-03-16 21:46:02 +01:00
Michael Niedermayer
b37852c7d9
Merge commit '3e1b5cbc9ab0a61c9bec08a1df1404b9da6ed7ea'
...
* commit '3e1b5cbc9ab0a61c9bec08a1df1404b9da6ed7ea':
configure: handle Apple's armv7s in probe_arm_arch()
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-03-16 21:34:14 +01:00
Michael Niedermayer
6416dce490
Merge commit 'f01c77157789b8e3a59ed2c9646faf8299e41641'
...
* commit 'f01c77157789b8e3a59ed2c9646faf8299e41641':
fate: add explicit support for the toolchain configure option
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-03-16 21:27:23 +01:00
Michael Niedermayer
7c9ad3c4ea
Merge commit 'a9d60c390f35f3954821bd635fd31bbb5036b29d'
...
* commit 'a9d60c390f35f3954821bd635fd31bbb5036b29d':
doc: fate: remove outdated SSH key fingerprint
Conflicts:
doc/fate.texi
Not merged, this does not apply to our servers
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-03-16 21:19:29 +01:00
Rainer Hochecker
786032cad8
hevc: avoid unnecessary calls to get_format
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-03-16 20:48:14 +01:00
zhaoxiu.zeng
332776f6c5
avformat/cavsvideodec: use avpriv_find_start_code in cavsvideo_probe()
...
Signed-off-by: Zeng Zhaoxiu <zhaoxiu.zeng@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-03-16 15:40:10 +01:00
Michael Niedermayer
d79f7bf0d6
avcodec/x86/cavsdsp: remove incorrect LOCAL_ALIGN tmp
...
This is faster and simpler as well
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-03-16 14:51:51 +01:00
Michael Niedermayer
12cf61c3b2
avcodec/hevc: Fix undefined shifts
...
Found-by: Clang -fsanitize=shift
Reported-by: Thierry Foucu <tfoucu@google.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-03-16 14:27:11 +01:00
Michael Niedermayer
04c52389d8
avcodec/tdsc: Remove ;;
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-03-16 13:04:47 +01:00
Micah Galizia
fca0851879
avformat/hls: refactor repeated HLS option updates
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-03-16 13:01:39 +01:00
Martin Storsjö
2cb9c2fc59
movenc: Allow interleaving samples when writing fragmented files
...
This is incompatible with the omit_tfhd_offset flag (writing
position independent fragments with interleaving requires the
default_base_moof flag).
This makes the moof atoms slightly bigger, but can be better for
playback (improving locality of sample data in the mdat).
Signed-off-by: Martin Storsjö <martin@martin.st>
2015-03-16 13:23:19 +02:00
Martin Storsjö
50ff0c05b6
movenc: Support writing multiple trun atoms
...
This is needed if all the data for one track isn't continuous
within the mdat. Normally we make sure all the data for one
track is continuous, but in new cases we will need to have
the samples interleaved.
Signed-off-by: Martin Storsjö <martin@martin.st>
2015-03-16 13:23:19 +02:00
Janne Grunau
faab8f9fcb
configure: move cross_compile checks after the toolchain section
2015-03-16 11:55:47 +01:00
Janne Grunau
3e1b5cbc9a
configure: handle Apple's armv7s in probe_arm_arch()
2015-03-16 11:55:47 +01:00
Janne Grunau
f01c771577
fate: add explicit support for the toolchain configure option
2015-03-16 11:55:47 +01:00
Janne Grunau
a9d60c390f
doc: fate: remove outdated SSH key fingerprint
2015-03-16 11:55:47 +01:00
Michael Niedermayer
18a9647996
Merge commit '66a0ac0a802dd794acc1ab8559d3db9e98755b57'
...
* commit '66a0ac0a802dd794acc1ab8559d3db9e98755b57':
mkv: Add support for DVB subtitles
See: 4789c25d83
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-03-16 11:44:26 +01:00
Stefano Sabatini
83ee820a16
lavfi/sendcmd: improve error reporting and robustness in case of missing commands
...
In particular, fix crash with -vf sendcmd, when no arguments are provided.
2015-03-16 10:49:25 +01:00
James Almer
e8374d7202
x86/proresdsp: remove ff_prores_idct_put_10_sse4
...
It's exactly the same as the sse2 version.
Reviewed-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: James Almer <jamrial@gmail.com>
2015-03-16 01:52:44 -03:00
James Almer
bdd179c8cb
x86/proresdsp: remove unused macro
...
Reviewed-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: James Almer <jamrial@gmail.com>
2015-03-16 01:49:34 -03:00
Michael Niedermayer
1e4d0498df
avformat/mov: Disallow ".." in dref unless use_absolute_path is set
...
as this kind of allows to circumvent it to some extend.
We also could add a separate parameter or value to choose this
Found-by: ramiro
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-03-16 03:47:56 +01:00
Mark Reid
e575589378
libavformat/mxfdec: fix MXFPackage->comment_refs memory leak
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-03-16 03:37:44 +01:00
Micah Galizia
7859618aff
avformat/hls: store cookies returned in HLS key response
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-03-16 01:57:01 +01:00
Michael Niedermayer
e802abd6e3
avcodec/dcadec: if XLL is enabled use xll channels
...
Fixes outputting 14 channels instead of 7
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-03-16 01:19:18 +01:00
Michael Niedermayer
21d25441c6
avcodec/dcadec: Only upsample as much data as is there
...
Found-by: carl
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-03-16 00:44:54 +01:00
Michael Niedermayer
3e48616226
Merge commit '9a60b1fad02cb783b895b2145c3dafc01f7b337c'
...
* commit '9a60b1fad02cb783b895b2145c3dafc01f7b337c':
libswscale: fix compiler warnings enumerated type mixed with another type
Conflicts:
libswscale/swscale_unscaled.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-03-16 00:15:16 +01:00
Michael Niedermayer
4f3f5ee1ac
Merge commit '66028b7ba6b411ba12ef553e9c8f1f4a4fe27710'
...
* commit '66028b7ba6b411ba12ef553e9c8f1f4a4fe27710':
udp: Use AVOptions
Conflicts:
libavformat/udp.c
See: aefed6ca87
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-03-16 00:10:09 +01:00
Luca Barbato
66a0ac0a80
mkv: Add support for DVB subtitles
...
Bug-Id: 833
2015-03-15 23:49:17 +01:00
Michael Niedermayer
54db7df34b
Merge commit 'a4c5801070198c1f2af32fa5cf850c330615ac24'
...
* commit 'a4c5801070198c1f2af32fa5cf850c330615ac24':
sctp: Update to match tcp
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-03-15 22:43:10 +01:00
Michael Niedermayer
96bd032193
Merge commit 'acbe15a99f158dbb0edb837fb6557171dc4376d4'
...
* commit 'acbe15a99f158dbb0edb837fb6557171dc4376d4':
fate: Add test for DCA XLL
Conflicts:
tests/fate/audio.mak
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-03-15 22:20:15 +01:00
Michael Niedermayer
209001073a
Merge commit '217e4ff4d1f845b76e44634e29371cd09313d1c2'
...
* commit '217e4ff4d1f845b76e44634e29371cd09313d1c2':
dca: Support for XLL (lossless extension)
Conflicts:
Changelog
doc/general.texi
libavcodec/Makefile
libavcodec/dca.h
libavcodec/dca_exss.c
libavcodec/dcadata.h
libavcodec/dcadec.c
libavcodec/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-03-15 22:18:41 +01:00
Michael Niedermayer
e46a7fdc87
Merge commit '4da5aacc7eba274a4f18411120de539d39c5151e'
...
* commit '4da5aacc7eba274a4f18411120de539d39c5151e':
dca: Mark syncword constants unsigned; they do not fit in 32-bit signed int
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-03-15 21:14:46 +01:00
Michael Niedermayer
de41d5372f
avcodec/dvbsub_parser: Fix potential pointer overflows
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-03-15 20:26:08 +01:00
Clément Bœsch
84da9339c2
avfilter/palettegen: make sure at least one frame was sent to the filter
...
Fix FPE.
2015-03-15 19:09:20 +01:00
Himangi Saraogi
9a60b1fad0
libswscale: fix compiler warnings enumerated type mixed with another type
...
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
2015-03-15 18:29:22 +01:00
Luca Barbato
66028b7ba6
udp: Use AVOptions
...
Add AVOptions for options currently available as url parameters.
2015-03-15 18:29:11 +01:00
Luca Barbato
a4c5801070
sctp: Update to match tcp
...
Use AVOption and fallback over multiple addresses
2015-03-15 18:29:11 +01:00
Michael Niedermayer
0a4808741e
avcodec/h264dsp_template: Fix undefined shifts
...
Found-by: Clang -fsanitize=shift
Reported-by: Thierry Foucu <tfoucu@google.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-03-15 17:30:10 +01:00
Mark Reid
8d54850f33
libavformat/mxfenc: write user comment metadata
...
Reviewed-by: Tomas Härdin <tomas.hardin@codemill.se>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-03-15 17:17:38 +01:00
Stefano Sabatini
6a63d0d826
lavfi/eq: clarify error message in case of expression parsing error
2015-03-15 14:55:13 +01:00
Diego Biurrun
acbe15a99f
fate: Add test for DCA XLL
2015-03-15 14:51:44 +01:00
Niels Möller
217e4ff4d1
dca: Support for XLL (lossless extension)
...
Cleanup and integration by Diego Biurrun.
Signed-off-by: Diego Biurrun <diego@biurrun.de>
2015-03-15 14:51:36 +01:00
Michael Niedermayer
2cda1a16d0
avformat/dvbsub: Fix hypothetical pointer overflow in dvbsub_probe()
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-03-15 13:45:31 +01:00
Michael Niedermayer
32c4b504b4
avformat/mpegvideodec: fix hypothetical pointer overflow in mpegvideo_probe()
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-03-15 13:39:56 +01:00
zhaoxiu.zeng
84d8b4fb81
avformat/mpegvideodec: use avpriv_find_start_code in mpegvideo_probe()
...
Signed-off-by: Zeng Zhaoxiu <zhaoxiu.zeng@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-03-15 13:28:44 +01:00
zhaoxiu.zeng
213ddcb029
avformat/avidec: cleanup include
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-03-15 13:03:26 +01:00
zhaoxiu.zeng
bf696e265a
avformat/avidec: use avpriv_find_start_code in avi_read_packet()
...
Signed-off-by: Zeng Zhaoxiu <zhaoxiu.zeng@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-03-15 13:02:57 +01:00
Michael Niedermayer
e3f5b6f16d
avcodec/ac3: Fix undefined shift in ff_ac3_bit_alloc_calc_mask()
...
Found-by: Clang -fsanitize=shift
Reported-by: Thierry Foucu <tfoucu@google.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-03-15 11:21:50 +01:00
Michael Niedermayer
94ccbad488
avcodec/ac3dec: Fix undefined shifts
...
Found-by: Clang -fsanitize=shift
Reported-by: Thierry Foucu <tfoucu@google.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-03-15 04:30:41 +01:00
Michael Niedermayer
3b63819dfb
avcodec/vc1: Fix undefined shifts
...
Found-by: Clang -fsanitize=shift
Reported-by: Thierry Foucu <tfoucu@google.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-03-15 02:57:24 +01:00