Michael Niedermayer
f70d7eb20c
Move add/diff_int16 to lossless_videodsp
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-01-20 21:32:47 +01:00
Michael Niedermayer
78e39aa7ee
Merge remote-tracking branch 'cehoyos/master'
...
* cehoyos/master:
Avoid a possible overflow when reading Nikon avi files.
Add h263dsp dependency to mpeg1video and mpeg2video encoders.
Fix compilation with --disable-hwaccel=mpeg1_xvmc,mpeg2_xvmc
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-01-20 19:54:45 +01:00
Michael Niedermayer
eef74b2e97
Merge remote-tracking branch 'qatar/master'
...
* qatar/master:
lavc: deprecate CODEC_FLAG_EMU_EDGE and avcodec_get_edge_width().
Conflicts:
doc/APIchanges
libavcodec/utils.c
libavcodec/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-01-20 18:55:22 +01:00
Michael Niedermayer
8001e9f7d1
avcodec/jpeg2000dec: fix error detection in pix_fmt_match()
...
Fixes out of array accesses with CODEC_FLAG_EMU_EDGE
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-01-20 18:46:38 +01:00
Michael Niedermayer
723e7b86ea
avcodec/jpeg2000dec: calculate planar and pixelsize from pixel format descriptor
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-01-20 18:46:37 +01:00
Michael Niedermayer
6ba02602aa
avcodec/vmnc: Check that rectangles are within the picture
...
Prevents out of array accesses with CODEC_FLAG_EMU_EDGE
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-01-20 18:46:37 +01:00
Michael Niedermayer
7c6cf689d8
avcodec/diracdec: allocate edges internally instead of depending on CODEC_FLAG_EMU_EDGE being not set
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-01-20 17:52:55 +01:00
Michael Niedermayer
d83707c641
Merge commit '024db24912a39316b0ef0b7d793307d62da038f4'
...
* commit '024db24912a39316b0ef0b7d793307d62da038f4':
mpegvideo: allocate edges when encoding.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-01-20 17:09:35 +01:00
Michael Niedermayer
d08dd32863
avcodec/mpegvideo_enc: disable direct mode in load_input_picture() for dimensions%16 != 0
...
We currently read a whole 16x16 block from the input at a few places
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-01-20 17:04:57 +01:00
Michael Niedermayer
ea4b477a1b
Merge commit 'f7e85ee996b3886c2b13e928b83277382311af96'
...
* commit 'f7e85ee996b3886c2b13e928b83277382311af96':
lavc: allow the caller to override dimensions in ff_get_buffer()
Conflicts:
libavcodec/utils.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-01-20 15:07:45 +01:00
Stefano Sabatini
9ab8f3738a
examples/muxing: remove redundant {}
2014-01-20 13:10:10 +01:00
Stefano Sabatini
b933c72b5e
examples/muxing: change error checks, from "ret != 0" to "ret < 0"
...
More consistent and more future-proof.
2014-01-20 13:10:10 +01:00
Stefano Sabatini
d72c742d47
examples/muxing: factorize write_interleave code
...
Also log output packet information.
2014-01-20 13:10:10 +01:00
Stefano Sabatini
5e2b8e4934
examples: add remuxing example
...
Show how to perform streamcopy from one container to another.
2014-01-20 13:10:10 +01:00
Anton Khirnov
93c553c71e
lavc: deprecate CODEC_FLAG_EMU_EDGE and avcodec_get_edge_width().
2014-01-20 12:52:28 +01:00
Anton Khirnov
024db24912
mpegvideo: allocate edges when encoding.
...
Allocating edges will be removed from generic code, so the encoder must
handle this explicitly.
2014-01-20 12:50:14 +01:00
Anton Khirnov
f7e85ee996
lavc: allow the caller to override dimensions in ff_get_buffer()
...
This will be useful for allocating edges in the encoders.
2014-01-20 12:49:47 +01:00
Carl Eugen Hoyos
b7702fafb3
Avoid a possible overflow when reading Nikon avi files.
...
Suggested-by: Reimar
2014-01-20 11:40:35 +01:00
Carl Eugen Hoyos
9b78abae19
Add h263dsp dependency to mpeg1video and mpeg2video encoders.
...
Fixes compilation with:
configure --disable-everything --enable-encoder=mpeg2video --disable-asm
2014-01-20 11:25:55 +01:00
Carl Eugen Hoyos
c892621577
Fix compilation with --disable-hwaccel=mpeg1_xvmc,mpeg2_xvmc
2014-01-20 11:20:46 +01:00
Michael Niedermayer
4014b401b0
Merge remote-tracking branch 'cehoyos/master'
...
* cehoyos/master:
Allow decoding of slightly broken Nikon avi files.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-01-20 04:24:02 +01:00
Michael Niedermayer
a493f8541d
avcodec/x86/dsp: add_int16_mmx / add_int16_sse2
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-01-20 04:06:46 +01:00
Michael Niedermayer
da0684820a
avcodec/dsputil/huffyuv: move diff int16 and add int16 to dsputil
...
This also fixes masking the bits
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-01-20 04:06:04 +01:00
Carl Eugen Hoyos
f9c2d4d17e
Allow decoding of slightly broken Nikon avi files.
...
Fixes ticket #3330 .
2014-01-20 01:44:07 +01:00
Peter Ross
f29cdbe1b5
vp8: remove redundant "equals 1" test
...
mb_layout is either zero or non-zero.
Signed-off-by: Peter Ross <pross@xvid.org>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-01-19 22:26:43 +01:00
wm4
1a193c438c
lavf: add avformat_get_mov_video_tags() and avformat_get_mov_audio_tags()
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-01-19 22:15:32 +01:00
Michael Niedermayer
fde2afd9fb
Merge remote-tracking branch 'qatar/master'
...
* qatar/master:
eac3: cosmetics, re-indent.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-01-19 21:53:25 +01:00
Michael Niedermayer
10f1ee2f92
Merge commit 'ade75fb811500f3e3f284737f123938d83be728f'
...
* commit 'ade75fb811500f3e3f284737f123938d83be728f':
(e)ac3: clip surround mix level indexes.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-01-19 21:46:32 +01:00
Michael Niedermayer
3a5a039ade
Merge commit 'c229f571fd3c7d7b567c27c87b2bbcdaee1b0e9f'
...
* commit 'c229f571fd3c7d7b567c27c87b2bbcdaee1b0e9f':
(e)ac3: parse and store the Lt/Rt and LFE mix levels.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-01-19 21:37:06 +01:00
Michael Niedermayer
c3d1215683
Merge commit '1f604f96ea70503caa642f68a85be6074a5b3f46'
...
* commit '1f604f96ea70503caa642f68a85be6074a5b3f46':
ac3: set default matrix encoding modes in parse_frame_header.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-01-19 21:18:18 +01:00
Michael Niedermayer
9d13432a90
avformat/matroskadec: identify SMI as SVQ3
...
Fixes part of Ticket3256
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-01-19 20:13:38 +01:00
Tim Walker
0d43b114cc
eac3: cosmetics, re-indent.
2014-01-19 19:12:58 +01:00
Tim Walker
ade75fb811
(e)ac3: clip surround mix level indexes.
...
Values 0-2 are reserved, 3 (-1.5dB) should be used instead.
2014-01-19 19:12:52 +01:00
Tim Walker
c229f571fd
(e)ac3: parse and store the Lt/Rt and LFE mix levels.
2014-01-19 19:12:42 +01:00
Tim Walker
1f604f96ea
ac3: set default matrix encoding modes in parse_frame_header.
...
Deduplicates some code.
2014-01-19 19:12:33 +01:00
Michael Niedermayer
48218580e1
avformat/matroskadec: support QDM2 as generated by mkvtoolnix-6.7.0
...
Fixes part of Ticket3256
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-01-19 18:48:49 +01:00
Michael Niedermayer
5800b08572
avformat/matroskadec: support SVQ3 as generated by mkvtoolnix-6.6.0
...
Fixes part of Ticket3256
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-01-19 18:48:11 +01:00
Michael Niedermayer
0500623d58
Merge remote-tracking branch 'cigaes/master'
...
* cigaes/master:
lavfi/dualinput: fix shortest option.
lavfi/vf_tile: use av_make_q.
lavfi/avf_concat: use av_make_q.
lavfi/af_amerge: use av_make_q.
lavu/rational: add syntactic sugar.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-01-19 17:48:07 +01:00
Michael Niedermayer
ad8d063f23
avcodec/mjpegdec: Dont skip picture allocation if theres no picture allocated
...
Fixes Ticket 3245
2014-01-19 17:30:22 +01:00
Nicolas George
2dc5980d61
lavfi/dualinput: fix shortest option.
...
Fix trac ticket #3315 .
2014-01-19 17:13:36 +01:00
Nicolas George
77b8d4e521
lavfi/vf_tile: use av_make_q.
2014-01-19 17:13:02 +01:00
Nicolas George
c4b7ad324b
lavfi/avf_concat: use av_make_q.
2014-01-19 17:12:50 +01:00
Nicolas George
bf9908c627
lavfi/af_amerge: use av_make_q.
2014-01-19 17:12:40 +01:00
Nicolas George
3532dd52c5
lavu/rational: add syntactic sugar.
...
Add a function to create a rational
and macros for common values.
2014-01-19 17:12:22 +01:00
Timothy Gu
5607242155
doc/muxers: add "Options", "Examples", "Syntax", etc. subsections
...
More consistent with codec docs. Also some minor reorganization of sentences
to fit the new document hierarchy.
Signed-off-by: Timothy Gu <timothygu99@gmail.com>
2014-01-19 13:40:37 +01:00
Timothy Gu
093439b481
doc/encoders: add libx264rgb doc and supported pixfmts for libx264(rgb)
...
Signed-off-by: Timothy Gu <timothygu99@gmail.com>
2014-01-19 13:40:32 +01:00
Stefano Sabatini
529573591a
doc/muxers/segment: fix formula for computing the segment_time_delta value
2014-01-19 12:20:10 +01:00
Stefano Sabatini
3dc494f8b9
lavfi/vidstabtransform: apply various documentation/option minor fixes
...
Improve consistency with the rest of the documentation.
2014-01-19 12:20:10 +01:00
Michael Niedermayer
676a395ab9
avcodec/aacdec: Dont fail if channels arent known yet
...
Fixes Ticket3312
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-01-19 06:20:46 +01:00
Michael Niedermayer
31e703e899
avcodec/mjpegdec: Dont treat the lack of a startcode differently from end of the bitstream
...
Fixes Ticket3303
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-01-19 05:03:16 +01:00