Michael Niedermayer
b0e1d0d9ee
ffv1enc: support PIX_FMT_YUV420P10 & PIX_FMT_YUV422P10
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-05-08 19:53:39 +02:00
Baptiste Coudurier
74bf9d6231
v210enc:clip values according to specifications
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-05-08 19:53:39 +02:00
Baptiste Coudurier
3e002747d1
v210enc: switch to PIX_FMT_422P10
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-05-08 19:53:39 +02:00
Baptiste Coudurier
807a058e8b
v210dec: switch to PIX_FMT_422P10
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-05-08 19:53:39 +02:00
Stefano Sabatini
4737a59373
ffv1: set internal frame defaults
...
Another fix missed before the vsrc_buffer changes.
2011-05-08 19:27:57 +02:00
Baptiste Coudurier
b9e608492a
swscale: 9,10 bits pixel format output support
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-05-08 14:27:13 +02:00
Baptiste Coudurier
299cbe2c9b
PIX_FMT_422P10 support
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-05-08 14:06:04 +02:00
Michael Niedermayer
af3c8f8230
adpcmenc:Optimize adpcm_ima_qt_compress_sample()
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-05-08 13:21:51 +02:00
Baptiste Coudurier
35d3d44a84
adpcmenc: fix QT IMA ADPCM encoder
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-05-08 13:15:48 +02:00
Baptiste Coudurier
b3d5a4b06e
adpcmdec: Fix QT IMA ADPCM decoder
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-05-08 13:13:17 +02:00
Mans Rullgard
fc7314b31c
regtest: remove redundant flags in jpg test
...
Signed-off-by: Mans Rullgard <mans@mansr.com>
2011-05-08 10:58:51 +01:00
Mans Rullgard
765f72f8c4
regtest: use run_ffmpeg in do_image_formats
...
Signed-off-by: Mans Rullgard <mans@mansr.com>
2011-05-08 10:58:46 +01:00
Mans Rullgard
2728fd9053
regtest: simplify encoding functions
...
The video encoding options were needlessly split in two parameters
which are merged. The do_audio_encoding function did not use its
second argument, so this can be removed.
Signed-off-by: Mans Rullgard <mans@mansr.com>
2011-05-08 10:58:32 +01:00
Anton Khirnov
648e55ff1b
ffmpeg.c: check for interlaced flag in the correct place.
...
In the corresponding codec context, not global options storage.
2011-05-08 10:43:24 +02:00
Michael Niedermayer
6d6b0c96fd
Merge remote branch 'qatar/master'
...
* qatar/master:
drawtext: add documentation for the shadow parameters
drawtext: add shadow support.
drawtext: factor draw_glyphs.
drawtext: fix and optimize yuv blend.
drawtext: get rid of divisions in the inner loop.
drawtext: simplify chroma blend and fix chroma alpha.
lavfi: Port drawtext filter by Hemanth from the libavfilter soc repo
Conflicts:
configure
libavfilter/avfilter.h
libavfilter/vf_drawtext.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2011-05-08 03:29:51 +02:00
Michael Niedermayer
732ff29bff
svq1dec: simpify mean calculation.
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-05-08 01:33:40 +02:00
Michael Niedermayer
8f5729d54d
svq1dec: replace /2 by >>1
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-05-08 01:33:40 +02:00
Michael Niedermayer
0257ac8f12
pnm: Fix spurious error message.
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-05-08 01:33:40 +02:00
Stefano Sabatini
7030501383
libopenjpeg: set internal frame defaults
...
Fix ffmpeg decoding, which was broken after the recent changes in
vsrc_buffer.
2011-05-08 00:02:47 +02:00
Reimar Döffinger
b06397acd4
Fix function pointer type to match function it is assigned.
2011-05-07 20:14:48 +02:00
Reimar Döffinger
80264dc422
Store pointers in a less messy way in SWSContext.
2011-05-07 20:14:48 +02:00
Reimar Döffinger
d3445a911c
Remove unused variable.
2011-05-07 20:14:48 +02:00
Reimar Döffinger
48b9b7edb3
Replace deprecated url_fseek by avio_seek.
2011-05-07 20:14:48 +02:00
Reimar Döffinger
5ce33e6bc5
Move ifdef to avoid unused variable warnings.
2011-05-07 20:14:47 +02:00
Reimar Döffinger
1795364205
Remove unused variables.
2011-05-07 20:14:47 +02:00
Reimar Döffinger
8c3651f4a5
Fix printf format string, fixes a warning.
2011-05-07 20:14:47 +02:00
Michael Niedermayer
7deaa2b8bd
riffenc/ffmpeg: Fix stream copy
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-05-07 20:03:04 +02:00
Michael Niedermayer
99119bdffe
ffplay: fix null pointer read when codec unavilable.
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-05-07 20:03:04 +02:00
Reimar Döffinger
6fd00e9dd9
aacdec: add decode_channel_map overread check
...
All decode_channel_map calls together can easily read
more data than the amount of padding available.
Thus below patch adds an input length check before reading them.
Fixes some invalid reads with sample from
http://bugzilla.mplayerhq.hu/show_bug.cgi?id=1138
2011-05-07 18:08:46 +02:00
Reimar Döffinger
5631729c3d
Increase TS packet size detection buffer.
...
Fixes warning message with ticket #68 .
2011-05-07 17:38:18 +02:00
Reimar Döffinger
90f5e991be
Assume some TS packet size instead of failing completely.
...
Fixes ticket #68 .
2011-05-07 17:38:18 +02:00
jan gerber
5901cd6236
oggdec:Correct duration
...
Based on a patch by Reimar Döffinger.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-05-07 16:21:55 +02:00
Michael Niedermayer
c8981edd90
Only add 1 byte to av_malloc(0) when it actually returned NULL
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-05-07 16:21:54 +02:00
Michael Niedermayer
91ff05f6ac
Make av_realloc(0) behave like our av_malloc(0)
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-05-07 16:21:47 +02:00
Stefano Sabatini
ea7f73c52e
vsrc_buffer: during init, print information about timebase and sample aspect ratio
2011-05-07 12:48:19 +02:00
Stefano Sabatini
64c06615d2
vsrc_buffer: simplify av_vsrc_buffer_add_frame*() interface
...
Now that pix_fmt, width, and height are directly embedded in the AVFrame,
there is no need to pass these values as separate arguments.
2011-05-07 12:03:59 +02:00
Stefano Sabatini
01042d4123
lavc: set defaults in internal codec frames
...
This is required specifically for setting frame->format to -1,
otherwise it will be set to 0 = PIX_FMT_YUV420P and code reading
the format from the output decoded frame will get misled.
In particular fix regressions occurring with the pending vsrc_buffer
patch.
2011-05-07 12:03:59 +02:00
Stefano Sabatini
2beac7c325
ffmpeg: rename ost->pict_tmp to ost->resample_frame
...
The new name is more consistent with the employed naming scheme, and
more meaningful.
2011-05-07 12:03:59 +02:00
Stefano Sabatini
04c373c1e9
ffmpeg: prefer dec/enc over ost/ist->st->codec in do_video_out()
...
Compact code, improve readability.
2011-05-07 12:03:58 +02:00
Stefano Sabatini
a851fa7fec
ffmpeg: move resample_changed check within the #if !CONFIG_AVFILTER
...
The check and the corresponding message in do_video_out() are
unnecessary in the libavfilter path, as a similar check and message
are performed within the buffer source.
2011-05-07 12:03:58 +02:00
Stefano Sabatini
70c24b2171
ffmpeg: remove useless intermediary variable resample_dst in do_video_out()
2011-05-07 12:03:58 +02:00
Stefano Sabatini
f5a669c229
ffmpeg: simplify mid-stream reconfiguration when libavfilter is disabled
...
Implement lazy initialization of the image resample context, so that
the initialization code does not need to be duplicated.
Also manage the case in which resample/size change mid-stream. For
each packet the code computes if resampling is needed.
Previously the resample check was done only at the initialization, in
case size/format changed and no resample was detected at the init
stage ffmpeg was silently exiting.
2011-05-07 12:03:58 +02:00
Stefano Sabatini
566666caf3
lavfi: add libavfilter/avcodec.h and avfilter_copy_frame_props()
...
avfilter_copy_frame_props() avoids code duplication and increases
robustness.
The added files libavfilter/avcodec.[ch] are used for containing
utilities useful for gluing togheter libavfilter and libavcodec.
2011-05-07 12:03:49 +02:00
Stefano Sabatini
18ded93ab3
lavc: add format field to AVFrame
...
The format is a per-frame property, having it in AVFrame simplify the
operation of extraction of that information, since avoids the need to
access the codec/stream context.
2011-05-07 11:45:37 +02:00
Stefano Sabatini
22333a6b19
lavc: add width and height fields to AVFrame
...
width and height are per-frame properties, setting these values in
AVFrame simplify the operation of extraction of that information,
since avoids the need to check the codec/stream context.
2011-05-07 11:45:30 +02:00
Reimar Döffinger
314374e579
Use MAP_FAILED to check for mmap failure instead of manually
...
recreating the value.
2011-05-07 10:34:55 +02:00
Stefano Sabatini
994de197c0
drawtext: add documentation for the shadow parameters
...
Signed-off-by: Anton Khirnov <anton@khirnov.net>
2011-05-07 10:21:56 +02:00
Michael Niedermayer
c5420f100f
drawtext: add shadow support.
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: Anton Khirnov <anton@khirnov.net>
2011-05-07 10:21:56 +02:00
Michael Niedermayer
e73127a443
drawtext: factor draw_glyphs.
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: Anton Khirnov <anton@khirnov.net>
2011-05-07 10:21:56 +02:00
Michael Niedermayer
a5b81c317e
drawtext: fix and optimize yuv blend.
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: Anton Khirnov <anton@khirnov.net>
2011-05-07 10:21:53 +02:00