84cd3729ef
imgconvert: fix regression with fate-gif colorspaces.
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at >
2012-04-17 04:05:14 +02:00
052ab20805
ffmpeg: fix regression with jpeg pix fmts
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at >
2012-04-17 04:05:01 +02:00
89f8637979
ffmpeg: fix regression with png
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at >
2012-04-17 04:04:56 +02:00
8a28fa010a
ffmpeg: choose_pix_fmt: pass target fmt in
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at >
2012-04-17 04:04:49 +02:00
4778783160
Merge commit '3b266da3d35f3f7a61258b78384dfe920d875d29'
...
* commit '3b266da3d35f3f7a61258b78384dfe920d875d29':
avconv: add support for complex filtergraphs.
avconv: make filtergraphs global.
avconv: move filtered_frame from InputStream to OutputStream.
avconv: don't set output width/height directly from input value.
avconv: move resample_{width,height,pix_fmt} to InputStream.
avconv: remove a useless variable from OutputStream.
avconv: get output pixel format from lavfi.
graphparser: fix the order in which unlabeled input links are returned.
avconv: change {input,output}_{streams,files} into arrays of pointers.
avconv: don't pass input/output streams to some functions.
Conflicts:
cmdutils.c
cmdutils.h
doc/ffmpeg.texi
ffmpeg.c
ffplay.c
Merged-by: Michael Niedermayer <michaelni@gmx.at >
2012-04-17 04:03:50 +02:00
6943fb47d3
avplay: update get_buffer to be inline with avconv
...
The buffer must have its dimension, pixel format and aspect ratio
set.
2012-04-16 15:12:03 -07:00
9fb7e14635
aacdec: More robust output configuration.
...
Save the old output configuration (if it has been used
successfully) when trying a new configuration. If the new configuration
fails to decode, restore the last successful configuration.
2012-04-16 14:09:52 -07:00
af2f655c02
faac: Fix multi-channel ordering
...
Signed-off-by: Alex Converse <alex.converse@gmail.com >
2012-04-16 14:09:52 -07:00
ca332b1d8c
faac: Add .channel_layouts
2012-04-16 14:09:51 -07:00
dcd207c4cb
matroskadec: use av_grow_packet in merge_packets.
...
It ensures that the packet is properly padded
and makes the code simpler.
Fixes trac ticket #1223 .
2012-04-16 22:17:24 +02:00
1a65d50ee7
mem.c: fix wrong comment.
...
Overwriting the av_malloc etc. functions is not easily
possible anymore, even for systems that support overriding
symbols in shared libraries in principle.
Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de >
2012-04-16 22:13:12 +02:00
071292b8c9
Respect -copyinkf for subtitles.
...
Necessary to make it possible to copy teletext streams
(trac issue #531 ).
Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de >
2012-04-16 22:13:12 +02:00
4a95876f4d
Add skip_to_keyframe stream variable.
...
This replaces the matroskadec one with the same name.
The advantage is not only easier reuse in other demuxers
but also that we can make the decisions after the parser.
This fixes seeking in files that mark the keyframes incorrectly,
for example the file in track ticket #1003 .
The matroska variable is still kept to be able to complain
about such broken files.
Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de >
2012-04-16 22:13:11 +02:00
b3b1751201
rtmp: Support 'rtmp_playpath', an option which overrides the stream identifier
...
This option is the stream identifier to play or to publish.
Sometimes the URL parser cannot determine the correct
playpath automatically, so it must be given explicitly
using this option (ie. -rtmp_playpath).
Signed-off-by: Martin Storsjö <martin@martin.st >
2012-04-16 23:11:58 +03:00
6465562e13
rtmp: Support 'rtmp_app', an option which overrides the name of application
...
This option is the name of application to connect on the RTMP server.
Sometimes the URL parser cannot determine the app name automatically,
so it must be given explicitly using this option (ie. -rtmp_app).
Signed-off-by: Martin Storsjö <martin@martin.st >
2012-04-16 23:11:53 +03:00
5e8280d177
avutil: add better documentation for AVSampleFormat
2012-04-16 15:26:55 -04:00
4fa706a4a6
svq3: check the watermark height.
...
Fixes division by 0
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at >
2012-04-16 18:36:40 +02:00
efe1ba7201
diracdec: check lowdelay bytes.
...
Fixes division by zero
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at >
2012-04-16 18:36:39 +02:00
a30165c4a8
omadec: make sample rate table large enough to prevent out of array reading.
...
The new values lead to error messages when used
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at >
2012-04-16 18:36:39 +02:00
c963189bc2
g729dec: initialize pitch_delay_int_prev to the minimum valid value.
...
This prevents an out of array read
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at >
2012-04-16 18:36:34 +02:00
8b84e082ed
indeo3: add parens around some macro arguments
...
Without these, the expansion contains things like --1 with
some compilers resulting in build errors.
Signed-off-by: Mans Rullgard <mans@mansr.com >
2012-04-16 16:09:08 +01:00
87a246341b
h264: use proper PROLOGUE statement for a function using 8 registers.
...
Fixes crashes when using biweight on win64.
2012-04-16 08:07:21 -07:00
31a45014f4
loco: fix 10l typo (missing case)
...
Found-by: Clément Bœsch <ubitux@gmail.com >
Signed-off-by: Michael Niedermayer <michaelni@gmx.at >
2012-04-16 16:46:53 +02:00
47f0beadba
dsicinav: Check for overread in RLE decode.
...
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at >
2012-04-16 16:44:12 +02:00
71d3c25a7e
smacker: Check get_vlc() return values.
...
Fixes out of array reads
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at >
2012-04-16 16:39:02 +02:00
8e77c3846e
dcadec: fix global array overread.
...
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at >
2012-04-16 16:27:34 +02:00
bdeb54e176
Support decoding LOCO_CRGBA.
...
Fixes a part of ticket #1222 .
2012-04-16 16:19:41 +02:00
884efd4e09
indeo4: avoid storing invalid values in quant_mat.
...
Fixes a global array overread
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at >
2012-04-16 15:27:39 +02:00
474e31c904
4xmdemux: Check chunk size
...
Fixes over reading the header array
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at >
2012-04-16 15:27:39 +02:00
e74fa25cb9
omadec: check GEOB sizes against buffer size
...
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at >
2012-04-16 13:51:40 +02:00
a10f71c1d6
vc1dec: add missing terminating element to mpeg4_video_profiles
...
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at >
2012-04-16 13:41:17 +02:00
e985cfd18b
vc1dec: check end_mb_y / start_mb_y validity
...
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at >
2012-04-16 13:36:11 +02:00
c4ce870967
flvdec: allocate large enough buffer so get_bits() doesnt overread
...
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at >
2012-04-16 12:01:55 +02:00
fa1b2c8e18
ffv1: attempt to workaround intel CC fate issue.
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at >
2012-04-16 12:01:46 +02:00
b553a425fb
doc: Update sample Vim config with suitable (function) indentation settings.
2012-04-16 10:12:45 +02:00
a3dbd459ff
dv: Merge dvquant.h into dvdata.c where all other DV tables reside.
2012-04-16 10:04:57 +02:00
05afc5f57d
dv: Move static tables only used in one place to where they are used.
2012-04-16 10:04:56 +02:00
aff01de641
graphparser: set next to NULL on an entry extracted from inputs list
...
Prevents it from referring to the rest of the list.
2012-04-16 09:28:34 +02:00
8dfb13ea59
adxdec: Check available space before decoding block.
...
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at >
2012-04-16 02:18:10 +02:00
6d24fe2c3c
segafilm: make the loop condition in film_read_packet() match the contents.
...
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at >
2012-04-16 02:18:09 +02:00
ed66bbfcb9
lavfi/aresample: properly propagate pts == AV_NOPTS_VALUE;
...
Signed-off-by: Stefano Sabatini <stefasab@gmail.com >
2012-04-16 01:08:00 +02:00
4d84c7ded6
yadif: fixed missing error handling for poll_frame.
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at >
2012-04-15 23:44:38 +02:00
3be0c86b97
sws: remove cliping in yuv2rgb code.
...
This code should not be needed and it slows things down.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at >
2012-04-15 23:38:42 +02:00
689e59b7ff
mov: reset dref_count on realloc to keep values consistent.
...
This fixes a potential crash.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at >
2012-04-15 23:37:09 +02:00
35e0496a7b
Merge remote-tracking branch 'qatar/master'
...
* qatar/master:
doc: Improve suggested Emacs settings for our coding style.
utvideo: Remove unused variable 'src_size'
mov: free memory on header parsing failure
mov: fix leaking memory with multiple drefs.
swscale: clip before assigning tables in RGB output functions.
swscale: fix off-by-one in second coefficient in bilinear filters.
Conflicts:
libavformat/mov.c
libswscale/output.c
Merged-by: Michael Niedermayer <michaelni@gmx.at >
2012-04-15 23:31:51 +02:00
88a97d660d
indeo5: check for unsupported luma block type
...
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at >
2012-04-15 21:02:01 +02:00
7ce118bae5
doc/filters: update documentation.
2012-04-15 20:37:47 +02:00
9e8aae443b
avconv: flush decoders immediately after an EOF.
...
Prevents extensive buffering when overlaying a single picture.
2012-04-15 20:37:47 +02:00
89605e4aa0
avconv: send EOF to vsrc_buffer.
2012-04-15 20:37:47 +02:00
3e901cbc75
avconv: reindent.
2012-04-15 20:37:42 +02:00
