]>
git.sesse.net Git - ffmpeg/log
Michael Niedermayer [Sun, 16 Dec 2012 12:08:53 +0000 (13:08 +0100)]
Merge commit '
27c8337e595a058347150269d5c2c48281e4285b '
* commit '
27c8337e595a058347150269d5c2c48281e4285b ':
h264-mt: handle NAL_DPAs before calling ff_thread_finish_setup
lavr: move AudioMix struct definition to audio_mix.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Paul B Mahol [Sun, 16 Dec 2012 11:57:42 +0000 (11:57 +0000)]
build: fix idf demuxer dependency
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Paul B Mahol [Mon, 10 Dec 2012 16:18:12 +0000 (16:18 +0000)]
Remove 8SVX_RAW on next lavc mayor bump
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Piotr Bandurski [Sun, 16 Dec 2012 10:39:18 +0000 (10:39 +0000)]
aiff: support in24/in32 tags
Supported by QuickTime, libaudiofile and Csound.
James Almer [Sun, 16 Dec 2012 00:15:04 +0000 (21:15 -0300)]
brstm: fix number of samples for the last block
Signed-off-by: James Almer <jamrial@gmail.com>
Piotr Bandurski [Sun, 16 Dec 2012 10:27:54 +0000 (10:27 +0000)]
thp: set duration
Stefano Sabatini [Sat, 15 Dec 2012 21:52:23 +0000 (22:52 +0100)]
ffplay: provide some feedback in case the codec cannot be set
Stefano Sabatini [Sat, 15 Dec 2012 21:42:21 +0000 (22:42 +0100)]
ffplay: set codec_id in codec context
Set codec id in case another codec is forced on the context (e.g. when
the user specify the codec with -codec).
For example fix:
ffplay -vcodec pgmyuv -i "tests/vsynth1/%02d.pgm"
Stefano Sabatini [Sat, 15 Dec 2012 21:40:26 +0000 (22:40 +0100)]
ffplay: improve robustness of opt_codec(), and add options acodec,vcodec,scodec
Fail with a meaningfull error message in case of bogus input.
Also the new options are more consistent with the rest of the tool
options, since it does not support generic stream specifiers.
Michael Niedermayer [Sun, 16 Dec 2012 04:09:23 +0000 (05:09 +0100)]
ffmpeg: Improve filter input fps selection heuristic.
This fixes a broken file that has a incorrect timebase at the codec level.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 16 Dec 2012 00:07:53 +0000 (01:07 +0100)]
wrap_timestamp: remove unneeded check
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 15 Dec 2012 23:56:12 +0000 (00:56 +0100)]
lavf: fix integer overflows
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 15 Dec 2012 22:33:20 +0000 (23:33 +0100)]
h264: dont mess with frame gaps on second fields.
Fixes assertion failure
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Peter Ross [Fri, 14 Dec 2012 12:31:41 +0000 (23:31 +1100)]
ffmpeg: replace magic number with VSYNC_CFR
Harald Axmann [Sun, 2 Dec 2012 18:27:21 +0000 (19:27 +0100)]
lavf: Provide a monotonic timestamp to the outside world
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Piotr Bandurski [Sat, 15 Dec 2012 16:51:26 +0000 (17:51 +0100)]
mpegvideo_enc/rv20: width and height must be multiple of 4
RealPlayer does not play rv20 files when sizes are not multiple of 4
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Stefano Sabatini [Sat, 15 Dec 2012 20:02:30 +0000 (21:02 +0100)]
doc/filters: remove @example use for showing syntax
I forgot to merge with the previous commit.
Stefano Sabatini [Wed, 12 Dec 2012 11:36:25 +0000 (12:36 +0100)]
doc/filters: extend syntax description for transpose, and add examples
Stefano Sabatini [Sat, 15 Dec 2012 16:08:18 +0000 (17:08 +0100)]
doc/filters: add basic crop examples
Use it to show difference between shorthand and named parameters.
Stefano Sabatini [Sat, 15 Dec 2012 16:03:12 +0000 (17:03 +0100)]
doc/filters: itemize crop examples
Stefano Sabatini [Sat, 15 Dec 2012 15:57:43 +0000 (16:57 +0100)]
lavfi/crop: add support to option parsing
Also fix documentation accordingly.
Janne Grunau [Fri, 14 Dec 2012 22:22:55 +0000 (23:22 +0100)]
h264-mt: handle NAL_DPAs before calling ff_thread_finish_setup
Since a NAL_DPA can start a new frame it has to be handled before
ff_thread_finish_setup is called.
Justin Ruggles [Fri, 14 Dec 2012 02:18:15 +0000 (21:18 -0500)]
lavr: move AudioMix struct definition to audio_mix.c
Michael Niedermayer [Sat, 15 Dec 2012 15:03:19 +0000 (16:03 +0100)]
dirac_parser: check prev_pu_offset before using it
Fixes out of array read
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Piotr Bandurski [Thu, 13 Dec 2012 16:33:42 +0000 (17:33 +0100)]
mpegvideo_enc/rv10: width and hieghtmust be multiple of 16
RealPlayer does not play correctly rv10 files when sizes are not multiple of 16
"RealVideo Encoder 1.0 supports any size image that is a multiple of sixteen pixels."
Reviewed-by: Nicolas George <nicolas.george@normalesup.org>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
rogerdpack [Thu, 13 Dec 2012 20:33:59 +0000 (13:33 -0700)]
lavd/dshow: rename dshow class name
Signed-off-by: rogerdpack <rogerpack2005@gmail.com>
Signed-off-by: Stefano Sabatini <stefasab@gmail.com>
Michael Niedermayer [Sat, 15 Dec 2012 13:18:13 +0000 (14:18 +0100)]
Merge remote-tracking branch 'qatar/master'
* qatar/master:
vp56: release frames on error
Conflicts:
libavcodec/vp56.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Stefano Sabatini [Sat, 15 Dec 2012 12:09:26 +0000 (13:09 +0100)]
lavfi/overlay: clarify/fix comment, add a few empty lines to ease readability
Stefano Sabatini [Sat, 15 Dec 2012 12:44:06 +0000 (13:44 +0100)]
lavfi/overlay: remove duplicated definition of ff_null_get_video_buffer()
Simplify.
Stefano Sabatini [Sat, 15 Dec 2012 12:40:35 +0000 (13:40 +0100)]
lavfi/avfilter.h: clarify doxy for AVFilterLink.out_buf
Michael Niedermayer [Sat, 15 Dec 2012 12:41:06 +0000 (13:41 +0100)]
Merge commit '
bb675d3ac6d722d5e117ae9042a996b55ca05b1d '
* commit '
bb675d3ac6d722d5e117ae9042a996b55ca05b1d ':
vp56: make parse_header return standard error codes
Conflicts:
libavcodec/vp56.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 15 Dec 2012 11:41:24 +0000 (12:41 +0100)]
fate: update fate for
1a490df12fd9
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Stefano Sabatini [Sat, 15 Dec 2012 10:41:12 +0000 (11:41 +0100)]
doc/APIchanges: fill empty git commit hashes and dates
Stefano Sabatini [Fri, 14 Dec 2012 10:59:13 +0000 (11:59 +0100)]
ffprobe: show pkt_size in frame
Fix trac ticket #2027.
Stefano Sabatini [Fri, 14 Dec 2012 10:58:21 +0000 (11:58 +0100)]
lavc: add pkt_size field to AVFrame
Jean First [Wed, 7 Nov 2012 10:27:06 +0000 (11:27 +0100)]
fate: check if rsync has the contimeout option
rsync on osx misses the --contimeout option
Signed-off-by: Jean First <jeanfirst@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 14 Dec 2012 23:19:20 +0000 (00:19 +0100)]
flashsv2_prime: check block before using it.
Fixes null pointer dereference
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 14 Dec 2012 22:37:14 +0000 (23:37 +0100)]
dcadec: check xch_base_channel against channel_order_tab.
Fix null pointer dereference
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 14 Dec 2012 20:50:23 +0000 (21:50 +0100)]
mp3on4: fix null pointer dereference
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 14 Dec 2012 19:57:25 +0000 (20:57 +0100)]
dnxhddec: fix CID changed check.
Fixes Null pointer dereference
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 14 Dec 2012 17:53:38 +0000 (18:53 +0100)]
fate: update asyncts reference
We cannot update the existing file because this would break
ffmpeg 1.0, which uses it
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Stefano Sabatini [Thu, 13 Dec 2012 20:19:25 +0000 (21:19 +0100)]
lavf/segment: provide more debug feedback when a new segment starts
Stefano Sabatini [Fri, 14 Dec 2012 10:44:31 +0000 (11:44 +0100)]
lavf/segment: add missing flags to segmenter option constants
Michael Niedermayer [Fri, 14 Dec 2012 17:10:19 +0000 (18:10 +0100)]
ass_split_section: dont overread array
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 14 Dec 2012 16:55:25 +0000 (17:55 +0100)]
westwood_vqa: fix null pointer dereference
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 14 Dec 2012 14:57:53 +0000 (15:57 +0100)]
Merge remote-tracking branch 'qatar/master'
* qatar/master:
ivi_common: check that scan pattern is set before using it.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 14 Dec 2012 14:53:48 +0000 (15:53 +0100)]
Merge commit '
07acdd651d1e2f4cfa5f610e616e70e323bb69cd '
* commit '
07acdd651d1e2f4cfa5f610e616e70e323bb69cd ':
ivi_common: use proper logging context in ivi_decode_blocks().
ivi_common: make some functions and tables static.
asyncts: ignore min_delta only if first_pts is set
Conflicts:
libavcodec/ivi_common.c
libavcodec/ivi_common.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 14 Dec 2012 14:42:58 +0000 (15:42 +0100)]
Merge commit '
c0dc57f1264dad1e121772d03abdb9e14ed8857f '
* commit '
c0dc57f1264dad1e121772d03abdb9e14ed8857f ':
asyncts: merge two conditions
x86inc: fully concatenate tokens to fix macro expansion for nasm
h264: initialize frame-mt context copies properly
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 14 Dec 2012 14:36:37 +0000 (15:36 +0100)]
Merge commit '
6a27ae28f9bde981e85c82cf5bf42c5f43fb6f13 '
* commit '
6a27ae28f9bde981e85c82cf5bf42c5f43fb6f13 ':
mpegvideo: treat delayed pictures as used
Conflicts:
libavcodec/h264.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 14 Dec 2012 14:30:12 +0000 (15:30 +0100)]
Merge commit '
bd255f9feb4deea4c990e582f0ba3b90d7b64b4c '
* commit '
bd255f9feb4deea4c990e582f0ba3b90d7b64b4c ':
lavc: set frame parameters after decoding only if necessary
Conflicts:
libavcodec/utils.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 14 Dec 2012 14:22:19 +0000 (15:22 +0100)]
h264: remove low_delay/has_b_frame setting code from nal loop
This code is now executed in h264_set_parameter_from_sps()
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 14 Dec 2012 14:00:28 +0000 (15:00 +0100)]
Merge commit '
072be3e8969f24113d599444be4d6a0ed04a6602 '
* commit '
072be3e8969f24113d599444be4d6a0ed04a6602 ':
h264: set parameters from SPS whenever it changes
asyncts: cosmetics: reindent
Conflicts:
libavcodec/h264.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 14 Dec 2012 12:58:12 +0000 (13:58 +0100)]
Merge commit '
b35e5d985dd12acf9a0aaa52334134edcf35d68e '
* commit '
b35e5d985dd12acf9a0aaa52334134edcf35d68e ':
doc: improve documentation for the asyncts filter first_pts option
asyncts: fix the asyncts behavior when using the first_pts option
Conflicts:
libavfilter/af_asyncts.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 14 Dec 2012 12:51:16 +0000 (13:51 +0100)]
Merge commit '
8083332c2de9ee189f96844ff4c2d9be1844116f '
* commit '
8083332c2de9ee189f96844ff4c2d9be1844116f ':
asyncts: use clipped delta value when setting resample compensation
asyncts: fix flushing of final samples at EOF
vp6: properly fail on unsupported feature
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Luca Barbato [Fri, 14 Dec 2012 08:55:04 +0000 (09:55 +0100)]
vp56: release frames on error
Fixes CVE-2012-2783
CC: libav-stable@libav.org
Luca Barbato [Fri, 14 Dec 2012 07:22:06 +0000 (08:22 +0100)]
vp56: make parse_header return standard error codes
Returning 0 for failure is misleading.
CC: libav-stable@libav.org
Anton Khirnov [Thu, 13 Dec 2012 18:38:20 +0000 (19:38 +0100)]
ivi_common: check that scan pattern is set before using it.
Fixes CVE-2012-2791.
CC: libav-stable@libav.org
Anton Khirnov [Thu, 13 Dec 2012 18:31:42 +0000 (19:31 +0100)]
ivi_common: use proper logging context in ivi_decode_blocks().
Anton Khirnov [Thu, 13 Dec 2012 18:25:52 +0000 (19:25 +0100)]
ivi_common: make some functions and tables static.
Peter Ross [Thu, 13 Dec 2012 23:06:15 +0000 (10:06 +1100)]
sauce: test filetype correctly for datatype 5 (binary text)
Michael Niedermayer [Fri, 14 Dec 2012 04:36:22 +0000 (05:36 +0100)]
mem: minor simplification of the alignment hack code
Idea-by: wanzhang
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 14 Dec 2012 03:49:09 +0000 (04:49 +0100)]
audioconvert/arm: require alignment of 16
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 14 Dec 2012 03:47:17 +0000 (04:47 +0100)]
audioconvert: support simd code with specific alignment requirements.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 14 Dec 2012 01:37:32 +0000 (02:37 +0100)]
configure/arm: print if thumb mode is enabled
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 14 Dec 2012 00:12:56 +0000 (01:12 +0100)]
g729dec: check pitch_delay_int.
Fix out of array read
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Justin Ruggles [Thu, 13 Dec 2012 18:20:51 +0000 (13:20 -0500)]
asyncts: merge two conditions
Justin Ruggles [Thu, 13 Dec 2012 23:30:20 +0000 (18:30 -0500)]
asyncts: ignore min_delta only if first_pts is set
Michael Niedermayer [Thu, 13 Dec 2012 23:30:34 +0000 (00:30 +0100)]
nuv: dont try to copy an empty frame
Fixes assertion failure
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Janne Grunau [Thu, 13 Dec 2012 21:42:11 +0000 (22:42 +0100)]
x86inc: fully concatenate tokens to fix macro expansion for nasm
Fixes build errors with nasm introduced in
6f40e9f070f7 for stack
memory alignment. Noticed by BugMaster.
Björn Axelsson [Thu, 13 Dec 2012 13:48:25 +0000 (14:48 +0100)]
flvenc: don't write random data if seek fails
The FLV muxer tries to update the header in write_trailer, which is
impossible if writing to a pipe or network stream. Don't write header
data if seek to header fails.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 13 Dec 2012 17:31:10 +0000 (18:31 +0100)]
docs: -asyncts has been replaced by aresample not asyncts in ffmpeg
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Stefano Sabatini [Sun, 9 Dec 2012 17:21:00 +0000 (18:21 +0100)]
lavf/segment: add segment_start_number option
Consistent with the image2 muxer.
Stefano Sabatini [Thu, 13 Dec 2012 10:37:50 +0000 (11:37 +0100)]
lavf/segment: add function set_segment_filename()
Factorize.
Janne Grunau [Wed, 12 Dec 2012 15:42:05 +0000 (16:42 +0100)]
mpegvideo: treat delayed pictures as used
This requires to move the avcodec_default_free_buffers() call to
ff_MPV_common_end() since otherwise delayed pictures would get freed
during a size change.
Janne Grunau [Wed, 12 Dec 2012 15:36:20 +0000 (16:36 +0100)]
lavc: set frame parameters after decoding only if necessary
Direct rendering capable decoders call get_buffer() which will set the
frame parameters.
Prevents frames with wrong parameters when a decoder outputs delayed
frames after a resolution or pixel format change.
Janne Grunau [Fri, 16 Nov 2012 00:12:40 +0000 (01:12 +0100)]
h264: set parameters from SPS whenever it changes
Fixes a crash in the fuzzed sample sample_varPAR.avi_s26638 with
alternating bit depths.
Janne Grunau [Sun, 9 Dec 2012 18:19:51 +0000 (19:19 +0100)]
h264: initialize frame-mt context copies properly
Justin Ruggles [Wed, 12 Dec 2012 18:19:16 +0000 (13:19 -0500)]
doc: improve documentation for the asyncts filter first_pts option
Note the time base for the option. Add an additional example description.
Justin Ruggles [Wed, 12 Dec 2012 18:26:57 +0000 (13:26 -0500)]
asyncts: use clipped delta value when setting resample compensation
The max_comp option is supposed to limit maximum compensation, but
currently the clipped value is not actually used.
Justin Ruggles [Thu, 13 Dec 2012 16:55:40 +0000 (11:55 -0500)]
asyncts: cosmetics: reindent
Justin Ruggles [Tue, 11 Dec 2012 22:36:09 +0000 (17:36 -0500)]
asyncts: fix the asyncts behavior when using the first_pts option
Currently it will do padding, but it does not properly handle
start-of-stream trimming as documented.
Justin Ruggles [Wed, 12 Dec 2012 18:10:13 +0000 (13:10 -0500)]
asyncts: fix flushing of final samples at EOF
Michael Niedermayer [Thu, 13 Dec 2012 17:17:48 +0000 (18:17 +0100)]
aresample: increase n_out buffer size a bit to reduce delay in some corner cases
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 13 Dec 2012 16:46:17 +0000 (17:46 +0100)]
mpegts: check av_new_stream() return value.
Fixes CID703728
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Luca Barbato [Thu, 13 Dec 2012 15:20:19 +0000 (16:20 +0100)]
vp6: properly fail on unsupported feature
Interlacing is not supported at all and mismanaged down the normal
codepaths causing possible buffer management issues.
CC: libav-stable@libav.org
Michael Niedermayer [Thu, 13 Dec 2012 14:07:20 +0000 (15:07 +0100)]
qt-faststart: Check offset_count
Fixes CID733836
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 13 Dec 2012 13:32:58 +0000 (14:32 +0100)]
cavsdec: check ff_get_buffer() return value
Fixes CID747721
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 13 Dec 2012 13:26:03 +0000 (14:26 +0100)]
snowenc: check ff_get_buffer() return value
Fixes CID747722
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 13 Dec 2012 13:20:24 +0000 (14:20 +0100)]
svq1enc: check ff_get_buffer() return value
Fixes CID747723
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 13 Dec 2012 02:07:33 +0000 (03:07 +0100)]
alsdec: propagate error codes in read_block()
Reviewed-by: Thilo Borgmann <thilo.borgmann@googlemail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 13 Dec 2012 02:04:49 +0000 (03:04 +0100)]
alsdec: make return checking for read_*_block_data() consistent
Reviewed-by: Thilo Borgmann <thilo.borgmann@googlemail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 13 Dec 2012 02:03:56 +0000 (03:03 +0100)]
alsdec: Use AVERROR_INVALIDDATA in read_const_block_data
Reviewed-by: Thilo Borgmann <thilo.borgmann@googlemail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Nedeljko Babic [Thu, 13 Dec 2012 08:54:04 +0000 (09:54 +0100)]
mips: ac3 downmix updated to the new data layout.
Signed-off-by: Nedeljko Babic <nbabic@mips.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Nicolas George [Wed, 12 Dec 2012 20:19:24 +0000 (21:19 +0100)]
lavf/matroskaenc: check for overflow in display width.
Michael Niedermayer [Thu, 13 Dec 2012 11:23:48 +0000 (12:23 +0100)]
Merge remote-tracking branch 'qatar/master'
* qatar/master:
aacdec: Fix an off-by-one overwrite when switching to LTP profile from MAIN.
x86inc: fix stack alignment on win64
rtpproto: Remove unused defines
Conflicts:
libavcodec/aacdec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 13 Dec 2012 11:18:00 +0000 (12:18 +0100)]
Merge commit '
f3f60dcbdd6ff2201526a603fe28293975bb7667 '
* commit '
f3f60dcbdd6ff2201526a603fe28293975bb7667 ':
rtpdec_mpeg4: Cosmetic cleanup
rtpdec: Cosmetic cleanup of the header
rtpdec: Get rid of a useless _s suffix on a struct name
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 13 Dec 2012 11:06:19 +0000 (12:06 +0100)]
Merge commit '
7941159df6aad2d219e2a7184489be7a735dd944 '
* commit '
7941159df6aad2d219e2a7184489be7a735dd944 ':
rtpdec/enc: Remove outdated/useless/misleading comments
rtpdec: Improve some comments
rtpdec: Remove unused context variables
rtpdec: Limit writing to the buffer size
svq1: Fix building with -DDEBUG
svq1: return meaningful error codes.
Conflicts:
libavcodec/svq1dec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 13 Dec 2012 10:53:09 +0000 (11:53 +0100)]
Merge commit '
998fdcff41bbda8ef13c991743376556f910efa9 '
* commit '
998fdcff41bbda8ef13c991743376556f910efa9 ':
lavc: replace some forgotten instances of PixelFormat with AVPixelFormat
svq1: unmacroify macros used only once.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 13 Dec 2012 10:38:52 +0000 (11:38 +0100)]
Merge commit '
95baf701db719ecad6b31000429e20eca2526ed6 '
* commit '
95baf701db719ecad6b31000429e20eca2526ed6 ':
svq1: deMpegEncContextize
Conflicts:
libavcodec/svq1dec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 13 Dec 2012 02:35:53 +0000 (03:35 +0100)]
lavfi: drop ff_null_start_frame/end_frame/draw_slice.
The functions have become unused
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>