fef75ef200
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>
2012-12-15 16:04:49 +01:00
fe3e0e486e
lavd/dshow: rename dshow class name
...
Signed-off-by: rogerdpack <rogerpack2005@gmail.com>
Signed-off-by: Stefano Sabatini <stefasab@gmail.com>
2012-12-15 15:46:20 +01:00
ac6cb666d9
Merge remote-tracking branch 'qatar/master'
...
* qatar/master:
vp56: release frames on error
Conflicts:
libavcodec/vp56.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-12-15 14:18:13 +01:00
54b0c04ae3
lavfi/overlay: clarify/fix comment, add a few empty lines to ease readability
2012-12-15 14:08:42 +01:00
3d1e2ada25
lavfi/overlay: remove duplicated definition of ff_null_get_video_buffer()
...
Simplify.
2012-12-15 13:51:24 +01:00
8f44170d30
lavfi/avfilter.h: clarify doxy for AVFilterLink.out_buf
2012-12-15 13:51:24 +01:00
f186ecc164
Merge commit 'bb675d3ac6d722d5e117ae9042a996b55ca05b1d'
...
* commit 'bb675d3ac6d722d5e117ae9042a996b55ca05b1d':
vp56: make parse_header return standard error codes
Conflicts:
libavcodec/vp56.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-12-15 13:41:06 +01:00
75b7e543df
fate: update fate for 1a490df12f
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-12-15 12:41:24 +01:00
33ab9ebd09
doc/APIchanges: fill empty git commit hashes and dates
2012-12-15 11:46:47 +01:00
1a490df12f
ffprobe: show pkt_size in frame
...
Fix trac ticket #2027 .
2012-12-15 11:46:47 +01:00
96d815fc0c
lavc: add pkt_size field to AVFrame
2012-12-15 11:46:30 +01:00
a8b3f0c5cf
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>
2012-12-15 01:33:19 +01:00
b6671787db
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>
2012-12-15 00:19:52 +01:00
02d6d05339
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>
2012-12-14 23:37:44 +01:00
51fcf276f8
mp3on4: fix null pointer dereference
...
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-12-14 21:50:43 +01:00
a99c273a3f
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>
2012-12-14 20:58:01 +01:00
e095c4ea6d
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>
2012-12-14 19:02:39 +01:00
ecebf6fc82
lavf/segment: provide more debug feedback when a new segment starts
2012-12-14 18:19:47 +01:00
df5f9496e6
lavf/segment: add missing flags to segmenter option constants
2012-12-14 18:19:47 +01:00
6ca2465556
ass_split_section: dont overread array
...
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-12-14 18:10:35 +01:00
b2c2589ecf
westwood_vqa: fix null pointer dereference
...
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-12-14 17:55:57 +01:00
3c5c6b9d61
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>
2012-12-14 16:05:12 +01:00
be26232efa
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>
2012-12-14 15:56:56 +01:00
a01fe55077
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>
2012-12-14 15:43:46 +01:00
2f265d9087
Merge commit '6a27ae28f9bde981e85c82cf5bf42c5f43fb6f13'
...
* commit '6a27ae28f9bde981e85c82cf5bf42c5f43fb6f13':
mpegvideo: treat delayed pictures as used
Conflicts:
libavcodec/h264.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-12-14 15:36:37 +01:00
86b4dc6277
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>
2012-12-14 15:30:12 +01:00
3b5c0f5e36
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>
2012-12-14 15:22:19 +01:00
b9d887c225
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>
2012-12-14 15:17:51 +01:00
b6e7041f90
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>
2012-12-14 13:58:12 +01:00
593f5c0f3c
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>
2012-12-14 13:51:20 +01:00
f33b5ba63e
vp56: release frames on error
...
Fixes CVE-2012-2783
CC: libav-stable@libav.org
2012-12-14 13:21:59 +01:00
bb675d3ac6
vp56: make parse_header return standard error codes
...
Returning 0 for failure is misleading.
CC: libav-stable@libav.org
2012-12-14 13:21:59 +01:00
deabb52ab4
ivi_common: check that scan pattern is set before using it.
...
Fixes CVE-2012-2791.
CC: libav-stable@libav.org
2012-12-14 07:10:53 +01:00
07acdd651d
ivi_common: use proper logging context in ivi_decode_blocks().
2012-12-14 07:10:48 +01:00
8ab42021f2
ivi_common: make some functions and tables static.
2012-12-14 07:08:38 +01:00
5c78a8129c
sauce: test filetype correctly for datatype 5 (binary text)
2012-12-14 16:46:29 +11:00
58f30175e1
mem: minor simplification of the alignment hack code
...
Idea-by: wanzhang
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-12-14 05:36:22 +01:00
d18706244f
audioconvert/arm: require alignment of 16
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-12-14 04:49:09 +01:00
ceb9f8d927
audioconvert: support simd code with specific alignment requirements.
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-12-14 04:47:17 +01:00
a286b04daf
configure/arm: print if thumb mode is enabled
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-12-14 02:37:32 +01:00
a974adc3c7
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>
2012-12-14 01:13:21 +01:00
c0dc57f126
asyncts: merge two conditions
2012-12-13 18:51:56 -05:00
4e5a8878d5
asyncts: ignore min_delta only if first_pts is set
2012-12-13 18:51:56 -05:00
56d09250ef
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>
2012-12-14 00:31:18 +01:00
0995ad8db4
x86inc: fully concatenate tokens to fix macro expansion for nasm
...
Fixes build errors with nasm introduced in 6f40e9f070
2012-12-13 23:57:09 +01:00
2947e7b7a7
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>
2012-12-13 21:54:35 +01:00
0aa0bab40d
docs: -asyncts has been replaced by aresample not asyncts in ffmpeg
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-12-13 21:54:35 +01:00
ddf6131a0a
lavf/segment: add segment_start_number option
...
Consistent with the image2 muxer.
2012-12-13 21:38:43 +01:00
d93d03a492
lavf/segment: add function set_segment_filename()
...
Factorize.
2012-12-13 21:05:07 +01:00
6a27ae28f9
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.
2012-12-13 21:02:42 +01:00
Piotr Bandurski
rogerdpack
Michael Niedermayer
Stefano Sabatini
Jean First
Luca Barbato
Anton Khirnov
Peter Ross
Justin Ruggles
Janne Grunau
Björn Axelsson