]>
git.sesse.net Git - ffmpeg/log
Paul B Mahol [Thu, 6 Jun 2013 21:42:02 +0000 (21:42 +0000)]
tiff: simplify picking right pixel format
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Paul B Mahol [Thu, 6 Jun 2013 20:17:36 +0000 (20:17 +0000)]
lavc: add ONLY_IF_THREADS_ENABLED where it is missing
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Michael Niedermayer [Thu, 6 Jun 2013 20:02:54 +0000 (22:02 +0200)]
jpeg2000: Zero prec->cblk
Prevent use of uninitialized memory / valgrind failure
Found-by: ubitux
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 6 Jun 2013 19:34:35 +0000 (21:34 +0200)]
jpeg2000dec: fix av_log()
Found-by: ubitux
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Paul B Mahol [Thu, 6 Jun 2013 19:42:01 +0000 (19:42 +0000)]
tiff: correctly decode saparate planes with horizontal differencing predictor
Closes #2648.
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Clément Bœsch [Thu, 6 Jun 2013 18:29:18 +0000 (20:29 +0200)]
lavf/tee: pesudo → pseudo.
Paul B Mahol [Thu, 6 Jun 2013 17:44:54 +0000 (17:44 +0000)]
lavfi/il: add timeline support
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Paul B Mahol [Thu, 6 Jun 2013 17:19:16 +0000 (17:19 +0000)]
lavfi/framestep: cosmetics: reindent AVFilter
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Paul B Mahol [Thu, 6 Jun 2013 17:17:14 +0000 (17:17 +0000)]
lavfi/framestep: add timeline support
Signed-off-by: Paul B Mahol <onemda@gmail.com>
James Almer [Thu, 6 Jun 2013 08:40:00 +0000 (05:40 -0300)]
APIchanges: Add missing entry for SHA-2 512
Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Stefano Sabatini [Thu, 6 Jun 2013 07:54:58 +0000 (09:54 +0200)]
ffprobe: show chapter and chapter metadata information
Address trac ticket #2636.
Michael Niedermayer [Thu, 6 Jun 2013 14:06:13 +0000 (16:06 +0200)]
jpeg2000dec: check that we have enough components for MCT
Fixes out of array accesses
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 6 Jun 2013 13:22:21 +0000 (15:22 +0200)]
jpeg2000dec: Use the matching coding style struct for transform selection
Fixes a null pointer dereference
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Carl Eugen Hoyos [Thu, 6 Jun 2013 10:09:38 +0000 (12:09 +0200)]
lavf/hlsenc: fix bogus hls segment index rewrapping logic
The counter should not be reset since it detects the
hls segment increasing timeframe.
Fixes ticket #2643.
Reviewed-by: Stefano Sabatini
Michael Niedermayer [Thu, 6 Jun 2013 08:50:33 +0000 (10:50 +0200)]
jpeg2000dec: Check that theres a SOT before SOD
Fixes out of array access
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 6 Jun 2013 01:01:17 +0000 (03:01 +0200)]
jpeg2000dec: Support 4 tile parts
Fixes out of array accesses
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Paul B Mahol [Thu, 6 Jun 2013 01:00:56 +0000 (01:00 +0000)]
flacdec: don't call allocate_buffers() in init_thread_copy() when s->max_blocksize is 0
This is normal, and happens when no extradata was available at decoder
initialization.
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Michael Niedermayer [Thu, 6 Jun 2013 00:19:24 +0000 (02:19 +0200)]
get_qcc: Check compno
Fixes out of array accesses
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Paul B Mahol [Mon, 3 Jun 2013 16:45:26 +0000 (16:45 +0000)]
alac: frame multi-threading support
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Paul B Mahol [Mon, 3 Jun 2013 16:22:46 +0000 (16:22 +0000)]
wavpack: frame multi-threading support
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Paul B Mahol [Mon, 3 Jun 2013 15:49:25 +0000 (15:49 +0000)]
ttadec: frame multi-threading support
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Paul B Mahol [Mon, 3 Jun 2013 15:47:53 +0000 (15:47 +0000)]
flacdec: frame multi-threading support
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Paul B Mahol [Mon, 3 Jun 2013 15:42:39 +0000 (15:42 +0000)]
takdec: frame multi-threading support
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Paul B Mahol [Mon, 3 Jun 2013 14:43:18 +0000 (14:43 +0000)]
audio frame multi-threaded decoding
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Michael Niedermayer [Wed, 5 Jun 2013 21:28:23 +0000 (23:28 +0200)]
MAINTAINERS: add fingerprint of the FFmpeg release signing key
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 5 Jun 2013 21:05:13 +0000 (23:05 +0200)]
jpeg2000dec: return error for invalid cdxy values
Fixes division by 0
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Stefano Sabatini [Wed, 5 Jun 2013 17:35:37 +0000 (19:35 +0200)]
Changelog: add missing entries about new mcdeint and sab filters
Michael Niedermayer [Wed, 5 Jun 2013 16:11:57 +0000 (18:11 +0200)]
jpeg2000: Make nreslevel fields int
This prevents potential integer overflows
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 5 Jun 2013 15:23:34 +0000 (17:23 +0200)]
jpeg2000dec: Propagate error code from get_cox() correctly
Without this the context state could become inconsistent
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 5 Jun 2013 16:04:20 +0000 (18:04 +0200)]
jpeg2000: check that nreslevels2decode has been initialized before use
Fixes out of array accesses
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 25 May 2013 13:33:44 +0000 (15:33 +0200)]
avformat/img2dec: timestamps are 64bit
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 5 Jun 2013 12:40:31 +0000 (14:40 +0200)]
avutil/mem: simplify av_reallocp_array() by using av_realloc_f()
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 5 Jun 2013 12:29:04 +0000 (14:29 +0200)]
avformat/network: remove unused variable
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 5 Jun 2013 10:25:10 +0000 (12:25 +0200)]
Merge remote-tracking branch 'qatar/master'
* qatar/master:
apetag: use int64_t for filesize
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 5 Jun 2013 10:20:26 +0000 (12:20 +0200)]
Merge commit '
274e134e49b1c92db0f0b8cb2ae7554fb7b9184c '
* commit '
274e134e49b1c92db0f0b8cb2ae7554fb7b9184c ':
avconv: check that the output format context exists before accessing it
Conflicts:
ffmpeg.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 5 Jun 2013 10:05:41 +0000 (12:05 +0200)]
Merge commit '
8b7dffc2d6c6c19f8e0a1fedcd0e95dce7a273ff '
* commit '
8b7dffc2d6c6c19f8e0a1fedcd0e95dce7a273ff ':
lavfi doxy: improve/extend AVFilter doxy.
Conflicts:
libavfilter/avfilter.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 5 Jun 2013 09:56:56 +0000 (11:56 +0200)]
Merge commit '
9835abb6d63fb07613994ae90e72fef758149408 '
* commit '
9835abb6d63fb07613994ae90e72fef758149408 ':
network: uniform ff_listen_bind and ff_listen_connect
Conflicts:
libavformat/network.c
libavformat/tcp.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 5 Jun 2013 09:33:19 +0000 (11:33 +0200)]
Merge commit '
7c020e1ad37d27c9d5db4d714401f09c80e3cc44 '
* commit '
7c020e1ad37d27c9d5db4d714401f09c80e3cc44 ':
movenc: Grow the frag_info array in chunks
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 5 Jun 2013 09:26:26 +0000 (11:26 +0200)]
Merge commit '
ab1189766a82a95f108005463cde75f73fcc0ae5 '
* commit '
ab1189766a82a95f108005463cde75f73fcc0ae5 ':
movenc: Increase the cluster array allocation by doubling
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 5 Jun 2013 09:19:16 +0000 (11:19 +0200)]
Merge commit '
3b4feac1ec14f861bdd7f494f288f4d8dd7f449e '
* commit '
3b4feac1ec14f861bdd7f494f288f4d8dd7f449e ':
movenc: Keep track of the allocated size for the cluster array
mem: Add av_realloc_array and av_reallocp_array
Conflicts:
doc/APIchanges
libavformat/movenc.c
libavutil/mem.c
libavutil/mem.h
libavutil/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Timothy Gu [Sat, 1 Jun 2013 23:26:03 +0000 (16:26 -0700)]
doc/encoders: add documentation for libtwolame
Michael Niedermayer [Wed, 5 Jun 2013 00:49:00 +0000 (02:49 +0200)]
swr: dont treat 32 and 24 as equal in simple copy check
Fixes dithering from 32 to 24 bit
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 5 Jun 2013 00:47:19 +0000 (02:47 +0200)]
swr: set scale for 32->32/24 dither
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Stefano Sabatini [Tue, 4 Jun 2013 22:06:23 +0000 (00:06 +0200)]
lavfi/mp: remove mp=sab
The filter was ported to a native libavfilter filter.
Stefano Sabatini [Mon, 3 Jun 2013 11:34:04 +0000 (13:34 +0200)]
lavfi: port sab filter from libmpcodecs
Paul B Mahol [Tue, 4 Jun 2013 11:56:14 +0000 (11:56 +0000)]
swresample: set flags & description and add documentation for output_sample_bits
Allows users to actually use such option.
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Michael Niedermayer [Tue, 4 Jun 2013 21:38:28 +0000 (23:38 +0200)]
swr: Fix dithering of s16 with SIMD
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 4 Jun 2013 21:35:19 +0000 (23:35 +0200)]
swr: add native_simd_one
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Paul B Mahol [Tue, 4 Jun 2013 21:43:59 +0000 (21:43 +0000)]
doc/general: update after
e4e4add0e3ba7
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Michael Niedermayer [Tue, 4 Jun 2013 18:34:38 +0000 (20:34 +0200)]
pngdec: dont treat mpng like png with key and non keyframes
Fixes Ticket2618
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Carl Eugen Hoyos [Mon, 3 Jun 2013 21:38:40 +0000 (23:38 +0200)]
Use av_log() instead of fprintf() in ffplay.
Fixes ticket #2630.
Reviewed-by: Marton Balint
Paul B Mahol [Tue, 4 Jun 2013 17:25:32 +0000 (17:25 +0000)]
tak: simplify ff_tak_check_crc()
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Anton Khirnov [Wed, 29 May 2013 14:18:40 +0000 (16:18 +0200)]
apetag: use int64_t for filesize
CC: libav-stable@libav.org
Anton Khirnov [Wed, 29 May 2013 13:38:21 +0000 (15:38 +0200)]
avconv: check that the output format context exists before accessing it
Fixes a segfault in exit_program() if opening an output file fails.
Anton Khirnov [Sun, 12 May 2013 12:02:59 +0000 (14:02 +0200)]
lavfi doxy: improve/extend AVFilter doxy.
Michael Niedermayer [Tue, 4 Jun 2013 12:54:58 +0000 (14:54 +0200)]
swresample/rematrix: add S32 mixing code
Needed for dithering S32
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 4 Jun 2013 12:53:58 +0000 (14:53 +0200)]
wresample/rematrix_template: fix internal types
Should make no difference, but future commits will need it
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Luca Barbato [Sat, 1 Jun 2013 17:38:57 +0000 (19:38 +0200)]
network: uniform ff_listen_bind and ff_listen_connect
Document the functions and have both use a millisecond timeout and
check for interrupt.
Andrey Semashev [Sun, 2 Jun 2013 20:26:18 +0000 (23:26 +0300)]
movenc: Grow the frag_info array in chunks
Previously it was grown one element at a time, which leads to
excessive reallocations.
Bug-Id: 525
Signed-off-by: Martin Storsjö <martin@martin.st>
Andrey Semashev [Mon, 3 Jun 2013 10:32:48 +0000 (13:32 +0300)]
movenc: Increase the cluster array allocation by doubling
The previous allocation increment of 16384 meant that the cluster
array was allocated for 0.6 MB initially, which is a bit excessive
for cases with fragmentation where only a fraction of that ever
actually is used.
Therefore, start off at a much smaller value, and increase by
doubling (to avoid reallocating too often when writing long
non-fragmented mp4 files).
Bug-Id: 525
Signed-off-by: Martin Storsjö <martin@martin.st>
Andrey Semashev [Sun, 2 Jun 2013 19:57:31 +0000 (22:57 +0300)]
movenc: Keep track of the allocated size for the cluster array
When writing fragmented mp4, the cluster array is reset when a
fragment is written. Instead of starting off reallocating the
array only based on the number of current elements in it, keep
track of how many elements there were allocated earlier.
This avoids reallocating this array needlessly when writing
fragmented mp4 files.
Bug-Id: 525
Signed-off-by: Martin Storsjö <martin@martin.st>
Martin Storsjö [Mon, 3 Jun 2013 09:31:46 +0000 (12:31 +0300)]
mem: Add av_realloc_array and av_reallocp_array
These help avoiding overflows and simplify error handling.
Signed-off-by: Martin Storsjö <martin@martin.st>
Michael Niedermayer [Tue, 4 Jun 2013 11:56:01 +0000 (13:56 +0200)]
Merge remote-tracking branch 'lukaszmluki/master'
* lukaszmluki/master:
ftp: fix using uninitialized value
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 4 Jun 2013 11:19:27 +0000 (13:19 +0200)]
ffserver: fix null pointer dereference
Fixes CID732208
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Lukasz Marek [Tue, 4 Jun 2013 11:03:13 +0000 (13:03 +0200)]
ftp: fix using uninitialized value
Fix coverity issue CID
1026777
Signed-off-by: Lukasz Marek <lukasz.m.luki@gmail.com>
Michael Niedermayer [Tue, 4 Jun 2013 00:27:21 +0000 (02:27 +0200)]
vc1dec: Disable dead code
Fixes CID732197/6
A assert is added to check that the disabled code wont
be needed in the future.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Paul B Mahol [Mon, 3 Jun 2013 22:16:02 +0000 (22:16 +0000)]
lavf/aacdec: add support for reading ape tags
Closes #2634.
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Paul B Mahol [Mon, 3 Jun 2013 22:52:50 +0000 (22:52 +0000)]
tta: add support for reading ape tags
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Paul B Mahol [Mon, 3 Jun 2013 22:26:16 +0000 (22:26 +0000)]
tta: return meaningful error codrs
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Paul B Mahol [Mon, 3 Jun 2013 19:21:17 +0000 (19:21 +0000)]
flacdec: use init_get_bits8()
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Michael Niedermayer [Mon, 3 Jun 2013 18:20:55 +0000 (20:20 +0200)]
Merge branch 'master' of https://github.com/upsuper/ffmpeg-vdadec
* 'master' of https://github.com/upsuper/ffmpeg-vdadec:
vda_h264_dec: remove check_format
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 3 Jun 2013 14:11:29 +0000 (16:11 +0200)]
avformat/network: check the return value from setsockopt()
Fixes: CID1026742
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 3 Jun 2013 14:07:06 +0000 (16:07 +0200)]
matroskadec: fix memleak of pkt_data
Fixes: CID1026767
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 3 Jun 2013 14:05:09 +0000 (16:05 +0200)]
matroskadec: favor av_freep()
av_freep() is safer as it zeros the pointer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 3 Jun 2013 13:41:29 +0000 (15:41 +0200)]
avfilter/vf_mcdeint: free frame on error
Fixes CID1026766
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 3 Jun 2013 13:26:50 +0000 (15:26 +0200)]
avfilter/process_options: fix memleak
Fixes CID1026765
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 3 Jun 2013 12:51:28 +0000 (14:51 +0200)]
avfilter/af_astats: rename stat()
See CID1026741
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 3 Jun 2013 12:40:15 +0000 (14:40 +0200)]
tiff: fix memleak
Fixes CID1026764
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 3 Jun 2013 12:37:16 +0000 (14:37 +0200)]
jpeg2000dec: assert that curtileno is valid when used
Fixes CID1026755
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 3 Jun 2013 12:30:09 +0000 (14:30 +0200)]
jpeg2000: Fix unintended sign extension in malloc arguments of prec
Fixes: CID1026772/3
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 3 Jun 2013 12:16:19 +0000 (14:16 +0200)]
jpeg2000: Fix Unintended sign extension in malloc arguments of cblk.
Fixes CID1026770
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 3 Jun 2013 12:09:12 +0000 (14:09 +0200)]
h264_ps: fix memleak in ff_h264_decode_picture_parameter_set()
Fixes: CID1026763
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 3 Jun 2013 12:06:25 +0000 (14:06 +0200)]
ffv1enc: Check return value of av_frame_ref()
Fixes CID1026740
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 2 Jun 2013 20:21:14 +0000 (22:21 +0200)]
avcodec/jpeg2000dwt: merge rescaling with interleave in 9/7 int IDWT
Tha fate tests change because the edge mirroring was wrong before this commit
Reviewed-by: Nicolas BERTRAND <nicoinattendu@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 2 Jun 2013 20:18:29 +0000 (22:18 +0200)]
avcodec/jpeg2000dwt: merge rescaling with interleave in 9/7 float IDWT
10% faster
Reviewed-by: Nicolas BERTRAND <nicoinattendu@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 1 Jun 2013 16:31:19 +0000 (18:31 +0200)]
jpeg2000dec; optimize output sample convert a bit
67935 -> 29984 kcycles
Reviewed-by: Nicolas BERTRAND <nicoinattendu@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 3 Jun 2013 10:54:35 +0000 (12:54 +0200)]
Merge remote-tracking branch 'qatar/master'
* qatar/master:
movenc: Change the track struct name to match the typedef
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 3 Jun 2013 10:42:31 +0000 (12:42 +0200)]
Merge commit '
2d66a58ccde05e764594bd7e5f0f9244634d0b2c '
* commit '
2d66a58ccde05e764594bd7e5f0f9244634d0b2c ':
Go2Webinar decoder
Conflicts:
Changelog
configure
libavcodec/avcodec.h
libavcodec/codec_desc.c
libavcodec/version.h
libavformat/riff.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 3 Jun 2013 10:33:00 +0000 (12:33 +0200)]
Merge commit '
31980b6abdd8ffb6953472a7a6b59f3aa5762c31 '
* commit '
31980b6abdd8ffb6953472a7a6b59f3aa5762c31 ':
vmd: decode videos with no LZ buffer size provided - they might not need it
Conflicts:
libavcodec/vmdav.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 3 Jun 2013 10:21:25 +0000 (12:21 +0200)]
Merge commit '
0aed0bfc62b273a780a2bfba3be56039fccd7423 '
* commit '
0aed0bfc62b273a780a2bfba3be56039fccd7423 ':
vmd: fix mode 3 decoding
Conflicts:
libavcodec/vmdav.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 3 Jun 2013 09:53:05 +0000 (11:53 +0200)]
Merge commit '
c011ceef78eae66039efc66d9551a7146e08838a '
* commit '
c011ceef78eae66039efc66d9551a7146e08838a ':
swscale: ppc: Remove commented-out define cruft
nsvdec: Remove commented-out debug cruft
cpu: Restructure code to avoid pointless ret variable indirection
Conflicts:
libavutil/cpu.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 3 Jun 2013 09:44:11 +0000 (11:44 +0200)]
Merge commit '
46ce9ded96ffcb798b03da894cdb5fdac376a6ee '
* commit '
46ce9ded96ffcb798b03da894cdb5fdac376a6ee ':
tiff: K&R formatting cosmetics
Conflicts:
libavcodec/tiff.c
libavcodec/tiff.h
libavcodec/tiffenc.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Martin Storsjö [Sun, 2 Jun 2013 20:29:04 +0000 (23:29 +0300)]
movenc: Change the track struct name to match the typedef
This makes the struct name (which isn't used anywhere) match the
name of the typedef, as for all the other structs declared in this
header.
Signed-off-by: Martin Storsjö <martin@martin.st>
Kostya Shishkov [Mon, 25 Feb 2013 20:38:25 +0000 (21:38 +0100)]
Go2Webinar decoder
Michael Niedermayer [Mon, 3 Jun 2013 00:59:10 +0000 (02:59 +0200)]
Merge remote-tracking branch 'cigaes/master'
* cigaes/master:
lavfi/trim: mark link closed on EOF.
ffmpeg: ignore EOF when pushing frames to filters.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Paul B Mahol [Mon, 3 Jun 2013 00:19:37 +0000 (00:19 +0000)]
jpeg2000dec: remove redundant error log message
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Paul B Mahol [Mon, 3 Jun 2013 00:16:39 +0000 (00:16 +0000)]
wavpack: remove redundant error log message
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Paul B Mahol [Sun, 2 Jun 2013 22:43:31 +0000 (22:43 +0000)]
tta: use interger instead of pointer to iterate output samples for 24-bit case
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Paul B Mahol [Sun, 2 Jun 2013 22:32:19 +0000 (22:32 +0000)]
tta: move GetBitContext out of private context
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Nicolas George [Sun, 2 Jun 2013 09:35:04 +0000 (11:35 +0200)]
lavfi/trim: mark link closed on EOF.
Fix trac ticket #2620.