Michael Niedermayer
373d7dd371
Merge commit '911fa05b514e1be009e00b79d7004b93717c023b'
...
* commit '911fa05b514e1be009e00b79d7004b93717c023b':
mvc: Specify the pixel format for the mv-mvc* tests
Conflicts:
tests/fate/video.mak
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-04-19 22:43:16 +02:00
Martin Storsjö
911fa05b51
mvc: Specify the pixel format for the mv-mvc* tests
...
Also set the RGBA pixel format correctly as the native endian format,
which is what it returns.
This fixes the tests on big endian.
Signed-off-by: Martin Storsjö <martin@martin.st>
2014-04-19 21:41:34 +03:00
Michael Niedermayer
75ef907db8
Merge commit '6dfd99c93808d6504dd5cb1fad847d68cb179352'
...
* commit '6dfd99c93808d6504dd5cb1fad847d68cb179352':
fate: add tests for SGI RLE and MVC1&2 decoders
Conflicts:
tests/fate/video.mak
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-04-19 20:40:02 +02:00
Michael Niedermayer
01a39a978c
Merge commit '55ddd700c67529ff2c6c4e976673f1341bba7a82'
...
* commit '55ddd700c67529ff2c6c4e976673f1341bba7a82':
Silicon Graphics Movie demuxer
Conflicts:
Changelog
libavformat/mvdec.c
libavformat/version.h
See: 6fb40779cd
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-04-19 20:17:33 +02:00
Michael Niedermayer
0c67ef2729
Merge commit '86a0432688216562926d4aee36118f01be6d5e1b'
...
* commit '86a0432688216562926d4aee36118f01be6d5e1b':
Silicon Graphics Motion Video Compressor 1 & 2 decoder
Conflicts:
Changelog
libavcodec/avcodec.h
libavcodec/mvcdec.c
libavcodec/version.h
See: 746b1dcc98
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-04-19 19:47:58 +02:00
Michael Niedermayer
e37dbfddda
Merge commit '07761294fc3f08e139e8a406ef7d5b63aaf1ecee'
...
* commit '07761294fc3f08e139e8a406ef7d5b63aaf1ecee':
Silicon Graphics RLE 8-bit video decoder
Conflicts:
Changelog
doc/general.texi
libavcodec/avcodec.h
libavcodec/sgirledec.c
libavcodec/version.h
See: afa1617b93
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-04-19 19:26:46 +02:00
Michael Niedermayer
928b5708f9
Merge commit '34c5a6660a9e5e3cf301691bb29d011638953dc2'
...
* commit '34c5a6660a9e5e3cf301691bb29d011638953dc2':
h264: codec reinit: remove statements without effect
Conflicts:
libavcodec/h264_slice.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-04-19 18:50:32 +02:00
Michael Niedermayer
c1bc20bfd9
Merge commit '6ef96292d99302a59f824713fc763f6abd3754df'
...
* commit '6ef96292d99302a59f824713fc763f6abd3754df':
utils: add yvyu422 to avcodec_align_dimensions2
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-04-19 18:38:39 +02:00
Michael Niedermayer
6ca0a976b2
Merge commit 'd23fc8846d255e31896453136b4c77bc6d5e873f'
...
* commit 'd23fc8846d255e31896453136b4c77bc6d5e873f':
filtfmts: remove unused lavf include
A include for channel_layout.h, is added otherwise compile would break
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-04-19 18:30:37 +02:00
Michael Niedermayer
74a8dbe1c4
Merge commit '58400ac133bcfb6bf8196b4e5208bc178307739b'
...
* commit '58400ac133bcfb6bf8196b4e5208bc178307739b':
lavfi: name anonymous structs
Conflicts:
libavfilter/buffersink.c
libavfilter/f_select.c
libavfilter/src_movie.c
libavfilter/vf_drawbox.c
libavfilter/vf_drawtext.c
libavfilter/vf_overlay.c
libavfilter/vf_showinfo.c
libavfilter/vf_unsharp.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-04-19 18:20:17 +02:00
Clément Bœsch
010732b73a
vp9/x86: simplify FILTER_INIT.
...
In the 2 FILTER_INIT usages, the source is already preloaded so that
extra complexity taken from FILTER_UPDATE is not necessary.
Also add forgotten "mask" argument in FILTER_{INIT,UPDATE} comments.
2014-04-19 17:30:33 +02:00
Clément Bœsch
b8d002dc95
vp9/x86: clarify mixed splatb.
2014-04-19 17:00:51 +02:00
Vittorio Giovara
6dfd99c938
fate: add tests for SGI RLE and MVC1&2 decoders
2014-04-19 16:24:27 +02:00
Peter Ross
55ddd700c6
Silicon Graphics Movie demuxer
...
Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
2014-04-19 16:24:27 +02:00
Peter Ross
86a0432688
Silicon Graphics Motion Video Compressor 1 & 2 decoder
...
Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
2014-04-19 16:24:26 +02:00
Peter Ross
07761294fc
Silicon Graphics RLE 8-bit video decoder
...
Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
2014-04-19 16:24:26 +02:00
Janne Grunau
34c5a6660a
h264: codec reinit: remove statements without effect
...
avctx->coded_{height,width} will always equal h->{height,width} since
init_dimensions() does that explicitly, Size changes are detected by
changes in mb_{height,width} earlier and propagated through the
needs_reinit variable.
2014-04-19 16:22:06 +02:00
Vittorio Giovara
6ef96292d9
utils: add yvyu422 to avcodec_align_dimensions2
2014-04-19 16:20:58 +02:00
Vittorio Giovara
d23fc8846d
filtfmts: remove unused lavf include
2014-04-19 16:20:57 +02:00
Vittorio Giovara
58400ac133
lavfi: name anonymous structs
2014-04-19 16:20:57 +02:00
James Almer
3b06208a57
x86/float_dsp: remove duplicated code from vector_dmul_scalar
...
Use the xm# and ym# aliases as they remain in sync with m# after a SWAP.
No actual changes to the assembly.
Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-04-19 14:21:51 +02:00
Michael Niedermayer
c91a798a2c
Merge remote-tracking branch 'cehoyos/master'
...
* cehoyos/master:
Fix compilation with !HAVE_6REGS.
Use MANGLE in cavsdsp.c to save two registers using gcc.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-04-19 14:17:51 +02:00
Michael Niedermayer
e8fc91e22a
Merge commit '4936ef6492f640e1606c6507f2c4e495164d3974'
...
* commit '4936ef6492f640e1606c6507f2c4e495164d3974':
configure: Handle armcc 5.0
Conflicts:
configure
See: db55365d0f
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-04-19 13:39:32 +02:00
Martin Storsjö
4936ef6492
configure: Handle armcc 5.0
...
The first line of the "armcc --vsn" output in one version is
"Product: ARM Compiler 5.04".
Signed-off-by: Martin Storsjö <martin@martin.st>
2014-04-19 12:49:20 +03:00
Carl Eugen Hoyos
b38910c979
Fix compilation with !HAVE_6REGS.
...
Can be tested with:
$ ./configure --cc='cc -m32' --disable-optimizations --enable-pic
2014-04-19 09:56:01 +02:00
Carl Eugen Hoyos
72c93abaad
Use MANGLE in cavsdsp.c to save two registers using gcc.
...
Fixes compilation with !HAVE_6REGS.
2014-04-19 09:54:26 +02:00
Peter Ross
f45a840907
avformat/mlv: add fate sample
...
Signed-off-by: Peter Ross <pross@xvid.org>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-04-19 05:06:06 +02:00
Peter Ross
ab683efb2b
Magic Lantern Video (MLV) demuxer
...
Signed-off-by: Peter Ross <pross@xvid.org>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-04-19 05:06:00 +02:00
Peter Ross
5331773cc3
ff_id3v2_read: add option to limit ID3 magic number search
...
Several chunked formats (AIFF, IFF,DSF) store ID3 metadata within an 'ID3 '
chunk tag. If such chunks are stored sequentially, it is possible for the
ID3v2 parser to confuse the chunk tag for the ID3 magic number. e.g.
[1st chunk tag ('ID3 ') | chunk size] [ID3 magic number | metadata ...]
[2nd chunk tag ('ID3 ') | chunk size] [ID3 magic number | metadata ...]
Fixes ticket #3530 .
Signed-off-by: Peter Ross <pross@xvid.org>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-04-19 04:25:01 +02:00
Peter Ross
c94305ae23
ff_id3v2_free_extra_meta: set the pointer pointing to extra_meta to NULL
...
Fixes ticket #3530 .
Signed-off-by: Peter Ross <pross@xvid.org>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-04-19 04:24:24 +02:00
csheng
549bbdfb4b
avformat/wavdec: enlarge probe_packets for wav
...
fix issue https://trac.ffmpeg.org/ticket/3550
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-04-19 03:54:10 +02:00
James Almer
d8f40ca251
fate: add DTS-ES test
...
Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-04-19 03:26:20 +02:00
Lukasz Marek
de705e52d4
lavd/xv: implement repaint message
...
Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com>
2014-04-19 02:18:45 +02:00
Lukasz Marek
9fcdfac894
lavd/xv: add window id param
...
Device is able to use existing window, that can be a
part of existing GUI - instead of newly created one.
Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com>
2014-04-19 02:18:45 +02:00
Lukasz Marek
5053897b6a
lavd/xv: keep aspect ratio
...
Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com>
2014-04-19 02:18:45 +02:00
Michael Niedermayer
d340dabb76
avfilter/vf_rotate: make int*90° rotates suck less speedwise
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-04-19 01:23:23 +02:00
Michael Niedermayer
c9aab1ee7f
avfilter/vf_rotate: fix several of by 1 errors
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-04-19 01:23:14 +02:00
Michael Niedermayer
4ebfb2c5ec
avfilter/vf_rotate: fix location of update operation
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-04-19 01:22:42 +02:00
Michael Niedermayer
a47cc877a0
avfilter/vf_rotate: increase fixed point precision
...
This ensures int_sins output doesnt have "random" lsbs
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-04-19 01:22:06 +02:00
Carl Eugen Hoyos
3a1feb01da
Fix standalone compilation of image2_alias_pix and image2_brender_pix demuxers.
2014-04-19 00:46:23 +02:00
Michael Niedermayer
60c8c7144e
avcodec/qtrleenc: use av_mallocz_array()
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-04-18 20:43:02 +02:00
Michael Niedermayer
683b6e3183
avcodec/smacker: use av_mallocz_array()
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-04-18 20:43:02 +02:00
Michael Niedermayer
9b888fb159
avcodec/roqvideoenc: use av_malloc(z)_array()
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-04-18 20:43:02 +02:00
Justin Ruggles
591c0c26b5
mjpeg: cosmetics: indentation
...
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
2014-04-18 12:41:17 -04:00
Justin Ruggles
39ef000e19
mjpeg: Do not fail jpeg decoding on bad EXIF data.
...
It is not required to correctly decode the image.
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
2014-04-18 12:41:10 -04:00
James Almer
968c44ce89
configure: Remove deprecated incompatible_fork_abi option
...
It's been deprecated since ffmpeg 2.0
Signed-off-by: James Almer <jamrial@gmail.com>
Analysis of the usage of the switches by: wm4
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-04-18 18:14:40 +02:00
Michael Niedermayer
71f8cdcc16
avcodec/snow: use av_malloc(z)_array()
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-04-18 15:22:29 +02:00
Michael Niedermayer
bb0d9aedcb
avcodec/tta: use av_malloc(z)_array()
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-04-18 15:19:09 +02:00
Michael Niedermayer
b9831364de
avcodec/vc1dec: use av_realloc_array()
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-04-18 15:15:08 +02:00
Peter Ross
0a13487b1a
avformat/dsddec: create audio stream before processing id3
...
This ensures stream[0] is always the audio stream (an assumption made
in dsf_read_packet).
Signed-off-by: Peter Ross <pross@xvid.org>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-04-18 14:33:57 +02:00