OSDN Git Service
Carl Eugen Hoyos [Sun, 30 Jun 2013 11:34:46 +0000 (13:34 +0200)]
Rename thread_init() in libavcodec and libavfilter as library_thread_init().
The aix header sys/thread.h contains a definition for thread_init().
Carl Eugen Hoyos [Sun, 30 Jun 2013 11:32:59 +0000 (13:32 +0200)]
Rename constant HZ in af_biquads.c as HERTZ.
The aix header sys/m_param.h defines HZ as _HZ.
Carl Eugen Hoyos [Sun, 30 Jun 2013 11:31:25 +0000 (13:31 +0200)]
Drop local lable from ppc asm timer.
The aix assembler does not support local lables.
Michael Niedermayer [Sun, 30 Jun 2013 11:42:41 +0000 (13:42 +0200)]
Merge commit '
7798a59dc14ae27efe64e639a42646002608a908'
* commit '
7798a59dc14ae27efe64e639a42646002608a908':
avconv: Don't include colorspace.h
No change as the commit is already part of ffmpeg.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 30 Jun 2013 11:22:24 +0000 (13:22 +0200)]
Merge commit '
02ec656af72030eea4f3d63e30b25625cce6a3df'
* commit '
02ec656af72030eea4f3d63e30b25625cce6a3df':
wmapro: error out on impossible scale factor offsets
The check is replaced by an assert(), as the condition cannot be
true except through bugs elsewhere (which should have been fixed
already)
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 30 Jun 2013 11:10:33 +0000 (13:10 +0200)]
Merge commit '
d4a217a408da4bd63acc02cd8f9ebe378a2ad65a'
* commit '
d4a217a408da4bd63acc02cd8f9ebe378a2ad65a':
wmapro: check the min_samples_per_subframe
Conflicts:
libavcodec/wmaprodec.c
See:
9166f483c52e7e0a031a7bb149bea16aaa72f344
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 30 Jun 2013 10:59:11 +0000 (12:59 +0200)]
Merge commit '
183880cfc4aae53ce504e13337791cad5841c80c'
* commit '
183880cfc4aae53ce504e13337791cad5841c80c':
pictor: use the correct logging context
No change, as this has already been fixed
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 30 Jun 2013 10:34:50 +0000 (12:34 +0200)]
avcodec/lpc: Use a function pointer from an initialized context
Fixes null pointer dereference
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 30 Jun 2013 10:20:12 +0000 (12:20 +0200)]
Merge commit '
c93ccf5a4cca722b39f05e9f5660b4cb75bc1740'
* commit '
c93ccf5a4cca722b39f05e9f5660b4cb75bc1740':
lpc: use levinson for the first pass of multipass cholesky
Conflicts:
libavcodec/lpc.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 30 Jun 2013 10:15:12 +0000 (12:15 +0200)]
Merge commit '
b545179fdff1ccfbbb9d422e4e9720cb6c6d9191'
* commit '
b545179fdff1ccfbbb9d422e4e9720cb6c6d9191':
x86: lpc: simd av_evaluate_lls
Conflicts:
libavutil/x86/lls.asm
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 30 Jun 2013 09:59:31 +0000 (11:59 +0200)]
lls.asm: disable ff_update_lls_avx
The code doesnt build with yasm from ubuntu 12.04
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 30 Jun 2013 09:41:45 +0000 (11:41 +0200)]
lls.asm: put avx code under if HAVE_AVX_EXTERNAL
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 30 Jun 2013 09:30:07 +0000 (11:30 +0200)]
Merge commit '
502ab21af0ca68f76d6112722c46d2f35c004053'
* commit '
502ab21af0ca68f76d6112722c46d2f35c004053':
x86: lpc: simd av_update_lls
The versions are bumped due to changes in lls.h which is used across
libraries affecting intra library ABI
(This version bump also covers changes to lls.h in the immedeatly previous
commits)
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 30 Jun 2013 09:22:15 +0000 (11:22 +0200)]
Merge commit '
41578f70cf8aec8e7565fba1ca7e07f3dc46c3d2'
* commit '
41578f70cf8aec8e7565fba1ca7e07f3dc46c3d2':
lpc: use function pointers, in preparation for asm
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 30 Jun 2013 08:54:12 +0000 (10:54 +0200)]
Merge commit '
cc6714bb16b1f0716ba43701d47273dbe9657b8b'
* commit '
cc6714bb16b1f0716ba43701d47273dbe9657b8b':
lpc: remove "decay" argument
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 29 Jun 2013 22:31:51 +0000 (00:31 +0200)]
get_xbits: assert validity of the number of bits
similar is already done in the other get_bits() functions
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 29 Jun 2013 23:29:49 +0000 (01:29 +0200)]
4xm: Dont ignore dc run errors
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 29 Jun 2013 23:28:25 +0000 (01:28 +0200)]
4xm: check for invalid zero ac coeffs
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 29 Jun 2013 23:01:24 +0000 (01:01 +0200)]
mjpeg_decode_dc: check code before using it in get_xbits()
Fixes undefined behavior
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Derek Buitenhuis [Sat, 29 Jun 2013 18:20:20 +0000 (14:20 -0400)]
ffmpeg: Don't include colorspace.h
The header is private, and ffmpeg.c doesn't use it
for anything.
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Michael Niedermayer [Sat, 29 Jun 2013 20:20:20 +0000 (22:20 +0200)]
get_pix_fmt_score: favor equal formats if all else equal
Fixes Ticket2578
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Derek Buitenhuis [Sat, 29 Jun 2013 18:20:20 +0000 (14:20 -0400)]
avconv: Don't include colorspace.h
The header is private, and avconv.c doesn't use it
for anything.
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Michael Niedermayer [Sat, 29 Jun 2013 17:27:49 +0000 (19:27 +0200)]
update all trac links to use the trac subdomain
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 29 Jun 2013 16:27:52 +0000 (18:27 +0200)]
Merge remote-tracking branch 'cehoyos/master'
* cehoyos/master:
Avoid a null pointer dereference on clean-up after oom in ac3 encoder.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Luca Barbato [Sat, 29 Jun 2013 00:16:50 +0000 (02:16 +0200)]
wmapro: error out on impossible scale factor offsets
Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
Luca Barbato [Fri, 28 Jun 2013 23:56:09 +0000 (01:56 +0200)]
wmapro: check the min_samples_per_subframe
Must be at least WMAPRO_BLOCK_MIN_SIZE.
Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
Luca Barbato [Sat, 29 Jun 2013 03:41:58 +0000 (05:41 +0200)]
pictor: use the correct logging context
Broken in
6d97484d72e33f7dde9493a9ead1a72e2f029605
Reuben Martin [Sat, 29 Jun 2013 02:11:53 +0000 (21:11 -0500)]
Added codec ID to playback DNxHD
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Carl Eugen Hoyos [Sat, 29 Jun 2013 15:50:07 +0000 (17:50 +0200)]
Avoid a null pointer dereference on clean-up after oom in ac3 encoder.
Carl Eugen Hoyos [Sat, 29 Jun 2013 14:04:07 +0000 (16:04 +0200)]
Avoid a null pointer dereference on oom when decoding smacker.
Fixes ticket #2728.
Carl Eugen Hoyos [Sat, 29 Jun 2013 14:02:43 +0000 (16:02 +0200)]
Propagate error return values from the smacker decoder.
Carl Eugen Hoyos [Sat, 29 Jun 2013 12:49:47 +0000 (14:49 +0200)]
Avoid a null pointer dereference on oom when decoding vc1.
Fixes ticket #2723.
Stefano Sabatini [Sat, 29 Jun 2013 12:09:47 +0000 (14:09 +0200)]
doc/muxers: apply various minor fixes to segment documentation
Stefano Sabatini [Sat, 29 Jun 2013 11:53:58 +0000 (13:53 +0200)]
doc/muxers: sort muxers by name
Loren Merritt [Sun, 16 Jun 2013 00:53:47 +0000 (00:53 +0000)]
lpc: use levinson for the first pass of multipass cholesky
Levinson is faster, and cholesky is only needed if we want to apply different
weights to different samples, which doesn't happen on the first pass.
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
Loren Merritt [Tue, 18 Jun 2013 21:30:43 +0000 (21:30 +0000)]
x86: lpc: simd av_evaluate_lls
1.5x-1.8x faster on sandybridge
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
Loren Merritt [Tue, 18 Jun 2013 21:30:42 +0000 (21:30 +0000)]
x86: lpc: simd av_update_lls
4x-6x faster on sandybridge
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
Loren Merritt [Tue, 18 Jun 2013 21:30:41 +0000 (21:30 +0000)]
lpc: use function pointers, in preparation for asm
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
Loren Merritt [Tue, 18 Jun 2013 21:30:40 +0000 (21:30 +0000)]
lpc: remove "decay" argument
We never used the rolling-average mode, and this makes av_update_lls 15% faster.
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
Michael Niedermayer [Sat, 29 Jun 2013 10:03:59 +0000 (12:03 +0200)]
Merge remote-tracking branch 'qatar/master'
* qatar/master:
wmapro: check num_vec_coeffs against the actual available buffer
Conflicts:
libavcodec/wmaprodec.c
The check is replaced by an assert.
See:
b21ba20cc83c80fe56192fee3626a8087f37d806
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 29 Jun 2013 09:37:38 +0000 (11:37 +0200)]
Merge commit '
6652338f43ef623045912d7f28b61adea05d27ae'
* commit '
6652338f43ef623045912d7f28b61adea05d27ae':
wmapro: return early on unsupported condition
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 29 Jun 2013 09:19:37 +0000 (11:19 +0200)]
Merge commit '
e30b068ef79f604ff439418da07f7e2efd01d4ea'
* commit '
e30b068ef79f604ff439418da07f7e2efd01d4ea':
wmapro: make sure there is room to store the current packet
The check is replaced by an assert as it is impossible to occur
See:
780d45473c32fa356c8ce385c3ea4692567c3228
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 29 Jun 2013 08:58:52 +0000 (10:58 +0200)]
Merge commit '
afe03092dd693d025d43e1620283d8d285c92772'
* commit '
afe03092dd693d025d43e1620283d8d285c92772':
lavc: move put_bits_left in put_bits.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 29 Jun 2013 01:44:15 +0000 (03:44 +0200)]
avformat: make av_register_*put_format() thread safe
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 29 Jun 2013 01:39:03 +0000 (03:39 +0200)]
avcodec/bitstream_filter: make av_register_bitstream_filter() thread safe
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 29 Jun 2013 01:24:32 +0000 (03:24 +0200)]
avcodec/parser: Make av_register_codec_parser() thread safe
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 29 Jun 2013 01:11:48 +0000 (03:11 +0200)]
avcodec: Make av_register_hwaccel() and avcodec_register() thread safe
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Timothy Gu [Sat, 29 Jun 2013 00:24:26 +0000 (17:24 -0700)]
cosmetics: Fix "dont" "wont" "doesnt" typos
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Chinen [Fri, 28 Jun 2013 05:16:39 +0000 (14:16 +0900)]
flac_parser.c: fix case when final frame is a false positive
Should fix https://ffmpeg.org/trac/ffmpeg/ticket/2552
Only did minimal testing on a few files and fate.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 28 Jun 2013 21:58:13 +0000 (23:58 +0200)]
udp: Fix receiving large udp packets
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Paul B Mahol [Fri, 28 Jun 2013 21:21:57 +0000 (21:21 +0000)]
tak_parser: properly mark packets as key frames
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Carl Eugen Hoyos [Fri, 28 Jun 2013 14:23:39 +0000 (16:23 +0200)]
Do not list libshine like a main option in configure's output.
It is listed as an enabled external library if applicable.
Luca Barbato [Fri, 28 Jun 2013 03:23:21 +0000 (05:23 +0200)]
wmapro: check num_vec_coeffs against the actual available buffer
Prevent yet another buffer overwrite.
Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
Luca Barbato [Fri, 28 Jun 2013 03:21:33 +0000 (05:21 +0200)]
wmapro: return early on unsupported condition
Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
Luca Barbato [Fri, 28 Jun 2013 02:03:47 +0000 (04:03 +0200)]
wmapro: make sure there is room to store the current packet
Prevent horrid and hard to trace struct overwrite.
Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
Luca Barbato [Fri, 28 Jun 2013 01:40:35 +0000 (03:40 +0200)]
lavc: move put_bits_left in put_bits.h
Timothy Gu [Fri, 28 Jun 2013 02:07:32 +0000 (19:07 -0700)]
doc/decoders: document libopus decoder
Signed-off-by: Stefano Sabatini <stefasab@gmail.com>
Timothy Gu [Fri, 28 Jun 2013 01:50:54 +0000 (18:50 -0700)]
doc/encoders: alphabetically list the encoders
Signed-off-by: Stefano Sabatini <stefasab@gmail.com>
Michael Niedermayer [Fri, 28 Jun 2013 10:39:26 +0000 (12:39 +0200)]
avfilter/avfilter: Make avfilter_register() thread safe
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 28 Jun 2013 08:14:12 +0000 (10:14 +0200)]
Merge remote-tracking branch 'cehoyos/master'
* cehoyos/master:
Avoid a null pointer dereference in avcodec_decode_video2().
Set block_align when reading QDM2 in mov.
Fix muxing QDM2 mono into caf.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 28 Jun 2013 08:08:43 +0000 (10:08 +0200)]
Merge remote-tracking branch 'qatar/master'
* qatar/master:
aac: return meaningful errors
Conflicts:
libavcodec/aacdec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 28 Jun 2013 08:00:51 +0000 (10:00 +0200)]
Merge commit '
6d8629aac13692447b54eac795bf74007ebf8987'
* commit '
6d8629aac13692447b54eac795bf74007ebf8987':
aac: K&R formatting cosmetics
Conflicts:
libavcodec/aacdec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Carl Eugen Hoyos [Thu, 27 Jun 2013 12:03:16 +0000 (14:03 +0200)]
Avoid a null pointer dereference in avcodec_decode_video2().
This could happen if oom occured while probing a file.
Reported in ticket #1900.
Carl Eugen Hoyos [Thu, 27 Jun 2013 11:58:30 +0000 (13:58 +0200)]
Set block_align when reading QDM2 in mov.
Fixes ticket #2718.
Carl Eugen Hoyos [Thu, 27 Jun 2013 09:09:02 +0000 (11:09 +0200)]
Fix muxing QDM2 mono into caf.
Michael Niedermayer [Fri, 28 Jun 2013 01:27:39 +0000 (03:27 +0200)]
avfilter/vf_mp: preserve pixel format when possible
Fixes Ticket2577
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Reuben Martin [Tue, 18 Jun 2013 00:09:34 +0000 (19:09 -0500)]
gxf: Added codec ID to playback AVCHD
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Stefano Sabatini [Thu, 27 Jun 2013 11:05:41 +0000 (13:05 +0200)]
lavc/mpegvideo_enc: simplify timestamp checks in load_input_picture()
Also improve error feedback while at it.
Reuben Martin [Thu, 13 Jun 2013 03:21:35 +0000 (22:21 -0500)]
Added GXF format code to identify AVC Intra video streams. This was an extension to the origional GXF spec implemented by Grass Valley.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Reuben Martin [Mon, 17 Jun 2013 20:22:46 +0000 (15:22 -0500)]
gxf: Factorize code in get_sindex()
Reviewed-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Reuben Martin [Mon, 17 Jun 2013 20:22:46 +0000 (15:22 -0500)]
gxf: Added GXF format code 25 which is used for DV codec in HD resolutions
Reviewed-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Nigel Touati-Evans [Thu, 27 Jun 2013 11:28:43 +0000 (12:28 +0100)]
Fix copying extradata to codec in mxfdec.c
The code that copies any extradata from the MXFDescriptor to the codec does
not set the size, which it should otherwise the copied data is useless.
Attached it a patch to correct this.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 27 Jun 2013 00:01:38 +0000 (02:01 +0200)]
Merge remote-tracking branch 'cus/stable'
* cus/stable:
ffplay: simplify and fix flushing out old subtitles on seeking
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Luca Barbato [Mon, 6 May 2013 23:29:36 +0000 (01:29 +0200)]
aac: return meaningful errors
Luca Barbato [Wed, 26 Jun 2013 23:22:06 +0000 (01:22 +0200)]
aac: K&R formatting cosmetics
Stefano Sabatini [Wed, 26 Jun 2013 22:13:41 +0000 (00:13 +0200)]
ffprobe: always exit 1 in case of errors
This is consistent with the other ff* tools, and also avoids spurious
success reports when ret%256 = 0.
Stefano Sabatini [Wed, 26 Jun 2013 22:11:21 +0000 (00:11 +0200)]
ffprobe: reindent after previous commit
Nicolas George [Wed, 26 Jun 2013 13:17:27 +0000 (15:17 +0200)]
ffprobe: fix exit code with stream specifiers
Without this fix, ffprobe would exit with a failure exit code if a stream
specifier is given that selects the last stream.
Signed-off-by: Nicolas George <nicolas.george@normalesup.org>
Stefano Sabatini [Wed, 26 Jun 2013 22:09:49 +0000 (00:09 +0200)]
ffprobe: simplify branching logic in probe_file()
Stefano Sabatini [Tue, 25 Jun 2013 19:17:05 +0000 (21:17 +0200)]
examples/muxing: rename audio/video_pts to audio/video_time
The new name is less confusing, since the variables represent times
rather than timestamps.
Stefano Sabatini [Wed, 26 Jun 2013 16:58:55 +0000 (18:58 +0200)]
doc/bitstream_filters: document the chomp filter
TODO: add some meaningful examples.
Stefano Sabatini [Wed, 26 Jun 2013 16:07:17 +0000 (18:07 +0200)]
doc/bitstream-filters.texi: add documentation for the aac_adtstoasc filter
Based on the notes in libavcodec/aac_adtstoasc_bsf.c.
Stefano Sabatini [Wed, 26 Jun 2013 15:59:38 +0000 (17:59 +0200)]
lavf/movenc: improve error feedback in case malformed AAC bitstream is detected
Consistent with the FLV muxer.
Stefano Sabatini [Wed, 26 Jun 2013 15:13:06 +0000 (17:13 +0200)]
lavf/mux: rename variable cortag -> tagbuf2 in init_muxer()
Possibly enhance readibility.
Stefano Sabatini [Wed, 26 Jun 2013 15:05:57 +0000 (17:05 +0200)]
lavc/utils: improve feedback in case of invalid packet size
Stefano Sabatini [Wed, 26 Jun 2013 14:13:58 +0000 (16:13 +0200)]
examples/Makefile: disable -O2 optimizations
There is no much point in optimizing example code, and the -O2 flag is
annoying when debugging.
Stefano Sabatini [Tue, 25 Jun 2013 22:03:15 +0000 (00:03 +0200)]
examples/muxing: remove useless instruction
Simpler and less confusing.
Marton Balint [Sun, 16 Jun 2013 12:13:28 +0000 (14:13 +0200)]
ffplay: simplify and fix flushing out old subtitles on seeking
Fixes the additional issue reported in ticket #2666.
Signed-off-by: Marton Balint <cus@passwd.hu>
Jean Delvare [Wed, 26 Jun 2013 13:50:55 +0000 (15:50 +0200)]
doc/filters: Fix texi syntax
Commit
f1efaf837117718e3b4c96336fe9b5f686b1fe30 used parentheses
instead of curly braces in texi syntax, resulting in warnings when
the documentation is generated. Fix that.
Signed-off-by: Jean Delvare <khali@linux-fr.org>
Cc: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 26 Jun 2013 13:07:13 +0000 (15:07 +0200)]
swscale: Fix PAL8 input with alpha
Fixes Ticket2158
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 26 Jun 2013 11:32:55 +0000 (13:32 +0200)]
avfilter/src_movie: Fix handling of packet size for video
See Ticket2556
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 26 Jun 2013 11:06:11 +0000 (13:06 +0200)]
libavfilter/src_movie: fix which packet is reset
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Carl Eugen Hoyos [Wed, 26 Jun 2013 07:42:47 +0000 (09:42 +0200)]
Require pthreads for compilation with OpenCL support.
Fixes a part of ticket #2422.
Reviewed-by: James Almer
Carl Eugen Hoyos [Wed, 26 Jun 2013 07:33:44 +0000 (09:33 +0200)]
Use AV_RN32 for an unaligned read in the mxg demuxer.
Fixes ticket #2707.
wm4 [Tue, 25 Jun 2013 23:17:27 +0000 (01:17 +0200)]
lavf: silence max_analyze_duration warning
This is part of normal operation with some formats. A warning should
indicate that something is wrong, and the documentation for AV_LOG_WARNING
says: "Something somehow does not look correct."
Since this message is most likely useful for debugging only, raise the
log level accordingly.
Plus-one-by: Stefano Sabatini <stefasab@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 25 Jun 2013 23:16:09 +0000 (01:16 +0200)]
avcodec/cllc: Fix clobbered ff_get_buffer() change
Issue-since:
9328ae484338b70a7f2dbcd420bbbac499df76cc
Found-by: Daemon404
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 25 Jun 2013 22:53:32 +0000 (00:53 +0200)]
vf_drawbox: give all v_log() a context
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 25 Jun 2013 22:52:16 +0000 (00:52 +0200)]
vf_drawbox: avoid declaration in for() arguments
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 25 Jun 2013 22:33:24 +0000 (00:33 +0200)]
Merge branch 'drawbox_exprs' of https://github.com/mjmvisser/FFmpeg
* 'drawbox_exprs' of https://github.com/mjmvisser/FFmpeg:
enabled expressions on x, y, w, h and t parameters for drawgrid and drawbox, added examples
Reviewed-by: Andrey Utkin
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Paul B Mahol [Tue, 25 Jun 2013 22:24:55 +0000 (22:24 +0000)]
xa: abort if number of channels or sample rate is 0
Fixes #2711.
Signed-off-by: Paul B Mahol <onemda@gmail.com>