Michael Niedermayer
3ba0bfe71f
Merge remote-tracking branch 'qatar/master'
...
* qatar/master:
ulti: Fix invalid reads
lavf: dealloc private options in av_write_trailer
yadif: support 10bit YUV
vc1: mark with ER_MB_ERROR bits overconsumption
lavc: introduce ER_MB_END and ER_MB_ERROR
error_resilience: use the ER_ namespace
build: move inclusion of subdir.mak to main subdir loop
rv34: NEON optimised 4x4 dequant
rv34: move 4x4 dequant to RV34DSPContext
aacdec: Use intfloat.h rather than local punning union.
Conflicts:
libavcodec/h264.c
libavcodec/vc1dec.c
libavfilter/vf_yadif.c
libavformat/Makefile
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2011-12-13 23:21:37 +01:00
Luca Barbato
63ccd46687
lavc: introduce ER_MB_END and ER_MB_ERROR
...
Simplify a little error resilience calls
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
2011-12-13 16:20:58 +01:00
Luca Barbato
5bf2ac2b37
error_resilience: use the ER_ namespace
...
Add the namespace to {AC_,DC_,MV_}{END,ERROR} macros
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
2011-12-13 16:20:58 +01:00
Michael Niedermayer
376ee20614
h263dec: restore error concealment functionality after merge
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-12-13 01:26:00 +01:00
Michael Niedermayer
8bc7fe4daf
Merge remote-tracking branch 'qatar/master'
...
* qatar/master:
doxygen: misc consistency, spelling and wording fixes
vcr1: drop unnecessary emms_c() calls without MMX code
Replace all uses of av_close_input_file() with avformat_close_input().
lavf: add avformat_close_input().
lavf: deprecate av_close_input_stream().
lavf doxy: add some basic demuxing documentation.
lavf doxy: add some general lavf information.
lavf doxy: add misc utility functions to a group.
lavf doxy: add av_guess_codec/format to the encoding group.
lavf doxy: add core functions to a doxy group.
Add basic libavdevice documentation.
lavc: convert error_recognition to err_recognition.
avconv: update -map option help text
x86: Require 7 registers for the cabac asm
x86: bswap: remove test for bswap instruction
bswap: make generic implementation more compiler-friendly
h264: remove useless cast
proresdec: fix decode_slice() prototype
Conflicts:
configure
doc/APIchanges
ffprobe.c
libavcodec/avcodec.h
libavcodec/celp_math.h
libavcodec/h264.c
libavfilter/src_movie.c
libavformat/anm.c
libavformat/avformat.h
libavformat/version.h
libavutil/avstring.h
libavutil/bswap.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2011-12-13 00:39:48 +01:00
Diego Biurrun
58c42af722
doxygen: misc consistency, spelling and wording fixes
2011-12-12 23:06:23 +01:00
Dustin Brody
5b22d6e132
lavc: convert error_recognition to err_recognition.
...
Signed-off-by: Anton Khirnov <anton@khirnov.net>
2011-12-12 19:42:50 +01:00
Michael Niedermayer
f97faf6751
Merge remote-tracking branch 'qatar/master'
...
* qatar/master:
id3v2: fix doxy comment - 'machine byte order' makes no sense on char arrays
VC1: restore mistakenly removed code
twinvq: check output buffer size before decoding
twinvq: return an error when the packet size is too small
lavf: export some forgotten symbols with non-av prefixes.
swscale: update altivec yuv2planeX asm to new per-plane API.
swscale: make yuv2yuvX_10_sse2/avx 8/9/16-bits aware.
yuv2planeX10 SIMD
swscale: decide whether to use yuv2plane1/X on a per-plane basis.
swscale: reintroduce full precision in 16-bit output.
Split up yuv2yuvX functions
Split out yuv2yuv1 luma and chroma in order to make them generic DSP functions
lavc: replace references to deprecated AVCodecContext.error_recognition to use AVCodecContext.err_recognition
lavc: translate non-flag-based er options into flag-based ef options at codec open
add -err_filter AVOptions to access flag-based error recognition
h264_weight: initialize "height" function argument properly.
presets: spelling error in libvpx 1080p50_60
avplay: fix fullscreen behaviour with SDL 1.2.14 on Mac OS X
Conflicts:
ffplay.c
libavformat/libavformat.v
libswscale/swscale.c
libswscale/x86/swscale_template.c
tests/ref/lavfi/pixfmts_scale
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2011-10-23 05:13:56 +02:00
Dustin Brody
9abc98737f
lavc: replace references to deprecated AVCodecContext.error_recognition to use AVCodecContext.err_recognition
...
Signed-off-by: Anton Khirnov <anton@khirnov.net>
2011-10-22 14:49:55 +02:00
Michael Niedermayer
6dbac85f8d
mpeg4: fix another packed divx issue.
...
Fixes getting_stuck.avi
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-09-06 04:09:43 +02:00
Michael Niedermayer
3e7e1f1509
mpeg4: adjust dummy frame threashold for packed divx.
...
Fixes Ticket427
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-09-02 18:04:28 +02:00
Michael Niedermayer
4ca6a151e0
Merge remote-tracking branch 'qatar/master'
...
* qatar/master:
avconv: print the codecs names in the stream mapping.
avconv: move the avcodec_find_decoder() call to add_input_streams().
Windows Media Image decoder (WMVP/WVP2)
ac3enc: remove outdated TODO comment for apply_channel_coupling()
Conflicts:
Changelog
libavcodec/avcodec.h
libavcodec/vc1dec.c
libavcodec/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2011-08-23 18:26:37 +02:00
Alberto Delmás
45ecda8554
Windows Media Image decoder (WMVP/WVP2)
...
Signed-off-by: Anton Khirnov <anton@khirnov.net>
2011-08-23 11:18:35 +02:00
Michael Niedermayer
84a6abd954
Merge remote-tracking branch 'qatar/master'
...
* qatar/master:
applehttp: fix variant discard logic
h263dec: Fix asserts broken by the elimination of FF_COMMON_FRAME.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2011-08-04 20:59:36 +02:00
Alex Converse
ad62507f32
h263dec: Fix asserts broken by the elimination of FF_COMMON_FRAME.
2011-08-03 17:56:47 -07:00
Michael Niedermayer
faba79e080
Merge remote-tracking branch 'qatar/master'
...
* qatar/master:
mxfdec: Include FF_INPUT_BUFFER_PADDING_SIZE when allocating extradata.
H.264: tweak some other x86 asm for Atom
probe: Fix insane flow control.
mpegts: remove invalid error check
s302m: use nondeprecated audio sample format API
lavc: use designated initialisers for all codecs.
x86: cabac: add operand size suffixes missing from 6c32576
Conflicts:
libavcodec/ac3enc_float.c
libavcodec/flacenc.c
libavcodec/frwu.c
libavcodec/pictordec.c
libavcodec/qtrleenc.c
libavcodec/v210enc.c
libavcodec/wmv2dec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2011-07-30 06:46:08 +02:00
Anton Khirnov
ec6402b7c5
lavc: use designated initialisers for all codecs.
...
It's more readable and less prone to breakage.
2011-07-29 08:42:34 +02:00
Michael Niedermayer
2dd2abe391
Merge remote-tracking branch 'qatar/master'
...
* qatar/master:
h263dec: Propagate AV_LOG_ERRORs from slice decoding through frame decoding with sufficient error recognition
x86: cabac: don't load/store context values in asm
H.264: optimize CABAC x86 asm for Atom
vp3/theora: flush after seek.
doc/fftools-common-opts: wording fixes missing from the previous commit.
doc: document using AVOptions in fftools.
cmdutils: add codec_opts parameter to setup_find_stream_info_opts()
cmdutils: clarify documentation for filter_codec_opts()
cmdutils: clarify documentation for setup_find_stream_info_opts()
lavf: add forgotten attribute_deprecated to av_find_stream_info()
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2011-07-29 01:50:53 +02:00
Dustin Brody
2a11952f45
h263dec: Propagate AV_LOG_ERRORs from slice decoding through frame decoding with sufficient error recognition
...
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
2011-07-28 15:23:07 -07:00
Michael Niedermayer
e10979ff56
Merge remote-tracking branch 'qatar/master'
...
* qatar/master:
changelog: misc typo and wording fixes
H.264: add filter_mb_fast support for >8-bit decoding
doc: Remove outdated comments about gcc 2.95 and gcc 3.3 support.
lls: use av_lfg instead of rand() in test program
build: remove unnecessary dependency on libs from 'all' target
H.264: avoid redundant alpha/beta calculations in loopfilter
H.264: optimize intra/inter loopfilter decision
mpegts: fix Continuity Counter error detection
build: remove unnecessary FFLDFLAGS variable
vp8/mt: flush worker thread, not application thread context, on seek.
mt: proper locking around release_buffer calls.
DxVA2: unbreak build after [657ccb5ac7
]
hwaccel: unbreak build
Eliminate FF_COMMON_FRAME macro.
Conflicts:
Changelog
Makefile
doc/developer.texi
libavcodec/avcodec.h
libavcodec/h264.c
libavcodec/mpeg4videodec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2011-07-12 01:42:32 +02:00
Diego Biurrun
657ccb5ac7
Eliminate FF_COMMON_FRAME macro.
...
FF_COMMON_FRAME holds the contents of the AVFrame structure and is also copied
to struct Picture. Replace by an embedded AVFrame structure in struct Picture.
2011-07-11 00:19:00 +02:00
Michael Niedermayer
9251942ca7
Fix mpeg4 padding bug detection with more than 128bit trash and slices.
...
Fixes ticket302
The second hunk is from anatoly
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-07-01 03:04:46 +02:00
Michael Niedermayer
99eb31e263
Merge remote-tracking branch 'qatar/master'
...
* qatar/master: (25 commits)
Replace custom DEBUG preprocessor trickery by the standard one.
vorbis: Remove non-compiling debug statement.
vorbis: Remove pointless DEBUG #ifdef around debug output macros.
cook: Remove non-compiling debug output.
Remove pointless #ifdefs around function declarations in a header.
Replace #ifdef + av_log() combinations by av_dlog().
Replace custom debug output functions by av_dlog().
cook: Remove unused debug functions.
Remove stray extra arguments from av_dlog() invocations.
targa: fix big-endian build
v4l2: remove one forgotten use of AVFormatParameters.pix_fmt.
vfwcap: add a framerate private option.
v4l2: add a framerate private option.
libdc1394: add a framerate private option.
fbdev: add a framerate private option.
bktr: add a framerate private option.
oma: check avio_read() return value
nutdec: remove unused variable
Remove unused variables
swscale: allocate larger buffer to handle altivec overreads.
...
Conflicts:
ffmpeg.c
libavcodec/dca.c
libavcodec/dirac.c
libavcodec/error_resilience.c
libavcodec/h264.c
libavcodec/mpeg12.c
libavcodec/mpeg4videodec.c
libavcodec/mpegvideo.c
libavcodec/mpegvideo_enc.c
libavcodec/pthread.c
libavcodec/rv10.c
libavcodec/s302m.c
libavcodec/shorten.c
libavcodec/truemotion2.c
libavcodec/utils.c
libavdevice/dv1394.c
libavdevice/fbdev.c
libavdevice/libdc1394.c
libavdevice/v4l2.c
libavformat/4xm.c
libavformat/apetag.c
libavformat/asfdec.c
libavformat/avidec.c
libavformat/mmf.c
libavformat/mpeg.c
libavformat/mpegenc.c
libavformat/mpegts.c
libavformat/oggdec.c
libavformat/oggparseogm.c
libavformat/rl2.c
libavformat/rmdec.c
libavformat/rpl.c
libavformat/rtpdec_latm.c
libavformat/sauce.c
libavformat/sol.c
libswscale/utils.c
tests/ref/vsynth1/error
tests/ref/vsynth2/error
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2011-06-03 05:19:30 +02:00
Alexander Strange
6a9c859444
H264/MPEG frame-level multi-threading.
...
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
2011-06-02 10:16:20 -07:00
Michael Niedermayer
39e4206dc6
Merge remote-tracking branch 'qatar/master'
...
* qatar/master: (32 commits)
doc: create separate section for audio encoders
swscale: Remove orphaned, commented-out function declaration.
swscale: Eliminate rgb24toyv12_c() duplication.
Remove h263_msmpeg4 from MpegEncContext.
APIchanges: Fill in git hash for fps_probe_size (30315a8
)
avformat: Add fpsprobesize as an AVOption.
avoptions: Return explicitly NAN or {0,0} if the option isn't found
rtmp: Reindent
rtmp: Don't try to do av_malloc(0)
tty: replace AVFormatParameters.sample_rate abuse with a private option.
Fix end time of last chapter in compute_chapters_end
ffmpeg: get rid of useless AVInputStream.nb_streams.
ffmpeg: simplify managing input files and streams
ffmpeg: purge redundant AVInputStream.index.
lavf: deprecate AVFormatParameters.channel.
libdc1394: add a private option for channel.
dv1394: add a private option for channel.
v4l2: reindent.
v4l2: add a private option for channel.
lavf: deprecate AVFormatParameters.standard.
...
Conflicts:
doc/APIchanges
doc/encoders.texi
ffmpeg.c
libavdevice/alsa-audio.h
libavformat/version.h
libavutil/opt.c
libswscale/rgb2rgb.h
libswscale/rgb2rgb_template.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2011-05-26 03:28:22 +02:00
Alex Converse
8c51620f21
Remove h263_msmpeg4 from MpegEncContext.
...
It was long ago superseded by msmpeg4_version.
2011-05-25 13:24:25 -07:00
Michael Niedermayer
a0cd98b594
Fix ticket127
...
This fixes detectiion of slightly too big dummy frames.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-05-22 21:31:27 +02:00
Stefano Sabatini
ce5e49b0c2
replace deprecated FF_*_TYPE symbols with AV_PICTURE_TYPE_*
2011-05-02 16:41:41 +02:00
Stefano Sabatini
975a1447f7
Replace deprecated FF_*_TYPE symbols with AV_PICTURE_TYPE_*.
...
Signed-off-by: Diego Biurrun <diego@biurrun.de>
2011-05-02 12:18:44 +02:00
Michael Niedermayer
be315a3232
Merge remote branch 'qatar/master'
...
* qatar/master:
Duplicate AMV: disable DR1 and don't override EMU_EDGE
Duplicate lavf: inspect more frames for fps when container time base is coarse
Wrong and we have correct fix: Fix races in default av_log handler
vorbis: Replace sized int_fast integer types with plain int/unsigned.
Remove disabled non-optimized code variants.
NO bswap.h: Remove disabled code.
Remove some disabled printf debug cruft.
Replace more disabled printf() calls by av_dlog().
NO tests: Remove disabled code.
NO Replace some commented-out debug printf() / av_log() messages with av_dlog().
vorbisdec: Replace some sizeof(type) by sizeof(*variable).
NO vf_fieldorder: Replace FFmpeg by Libav in license boilerplate.
Conflicts:
libavcodec/h264.c
libavcodec/vorbisdec.c
libavutil/log.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2011-04-30 01:58:26 +02:00
Diego Biurrun
2e15305b70
Remove some disabled printf debug cruft.
2011-04-29 20:00:53 +02:00
Michael Niedermayer
d7e5aebae7
Merge remote branch 'qatar/master'
...
* qatar/master: (23 commits)
ac3enc: correct the flipped sign in the ac3_fixed encoder
Eliminate pointless '#if 1' statements without matching '#else'.
Add AVX FFT implementation.
Increase alignment of av_malloc() as needed by AVX ASM.
Update x86inc.asm from x264 to allow AVX emulation using SSE and MMX.
mjpeg: Detect overreads in mjpeg_decode_scan() and error out.
documentation: extend documentation for ffmpeg -aspect option
APIChanges: update commit hashes for recent additions.
lavc: deprecate FF_*_TYPE macros in favor of AV_PICTURE_TYPE_* enums
aac: add headers needed for log2f()
lavc: remove FF_API_MB_Q cruft
lavc: remove FF_API_RATE_EMU cruft
lavc: remove FF_API_HURRY_UP cruft
pad: make the filter parametric
vsrc_movie: add key_frame and pict_type.
vsrc_movie: fix leak in request_frame()
lavfi: add key_frame and pict_type to AVFilterBufferRefVideo.
vsrc_buffer: add sample_aspect_ratio fields to arguments.
lavfi: add fieldorder filter
scale: make the filter parametric
...
Conflicts:
Changelog
doc/filters.texi
ffmpeg.c
libavcodec/ac3dec.h
libavcodec/dsputil.c
libavfilter/avfilter.h
libavfilter/vf_scale.c
libavfilter/vf_yadif.c
libavfilter/vsrc_buffer.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2011-04-27 03:51:04 +02:00
Anton Khirnov
e7021c0ed5
lavc: remove FF_API_HURRY_UP cruft
2011-04-26 08:16:05 +02:00
Michael Niedermayer
f35439699f
Merge remote branch 'qatar/master'
...
* qatar/master:
Fixed-point MDCT with 32-bit unscaled output
lavc: deprecate rate_emu
lavc: mark hurry_up for removal on next major bump
parser: mark av_parser_parse() for removal on next major bump
lavc: add missing audioconvert includes
jvdec: don't use deprecated CODEC_TYPE_*/PKT_FLAG_KEY
Conflicts:
libavcodec/h264.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2011-04-03 02:28:01 +02:00
Anton Khirnov
8ed2ae09a2
lavc: mark hurry_up for removal on next major bump
...
It has been deprecated for about five years, skip_idct/skip_frame should
be used instead.
2011-04-02 16:17:24 +02:00
Michael Niedermayer
d375c10400
Fake-Merge remote-tracking branch 'ffmpeg-mt/master'
2011-03-22 22:36:57 +01:00
Mans Rullgard
2912e87a6c
Replace FFmpeg with Libav in licence headers
...
Signed-off-by: Mans Rullgard <mans@mansr.com>
2011-03-19 13:33:20 +00:00
Michael Niedermayer
3088635a44
h263dec: produce a warning when excessive bitstream is discarded
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-03-03 18:22:27 +01:00
Michael Niedermayer
1b4580d1a2
Fix duplicate & droped frame in Californication.S02E01.HDTV.XviD-NoTV.avi
2011-03-03 03:37:44 +01:00
Diego Elio Pettenò
e7e2df27f8
Add ff_ prefix to data symbols of encoders, decoders, hwaccel, parsers, bsf.
...
None of these symbols should be accessed directly, so declare them as
hidden.
Signed-off-by: Mans Rullgard <mans@mansr.com>
(cherry picked from commit d36beb3f69
)
2011-01-28 03:15:34 +01:00
Diego Elio Pettenò
d36beb3f69
Add ff_ prefix to data symbols of encoders, decoders, hwaccel, parsers, bsf.
...
None of these symbols should be accessed directly, so declare them as
hidden.
Signed-off-by: Mans Rullgard <mans@mansr.com>
2011-01-26 16:08:45 +00:00
Michael Niedermayer
df59c9c0f8
Detect incorrect padding with wrong stuffing codes used by NEC N-02B.
...
I dont know if this is the best way to handle it. But it fixes http://kuwatan.jp/temp/n-02b.3gp
Fixes issue 2373.
Originally committed as revision 25875 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-12-04 05:44:18 +00:00
Stefano Sabatini
c6c98d0897
Move mm_support() from libavcodec to libavutil, make it a public
...
function and rename it to av_get_cpu_flags().
Originally committed as revision 25076 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-09-08 15:07:14 +00:00
Stefano Sabatini
7160bb716b
Rename FF_MM_ symbols related to CPU features flags as AV_CPU_FLAG_
...
symbols, and move them from libavcodec/avcodec.h to libavutil/cpu.h.
Originally committed as revision 25040 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-09-04 09:59:08 +00:00
Måns Rullgård
c0ec9918b0
Remove global mm_flags variable
...
Originally committed as revision 24909 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-08-24 17:47:05 +00:00
Carl Eugen Hoyos
0fd0ef7947
Add new decoder property max_lowres and do not init decoder if requested value is higher.
...
Originally committed as revision 24098 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-07-07 21:23:36 +00:00
Michael Niedermayer
d3752b15d8
Treat SIPP like xvid, fixed issue1966
...
Originally committed as revision 23336 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-05-26 17:23:36 +00:00
Diego Biurrun
ba87f0801d
Remove explicit filename from Doxygen @file commands.
...
Passing an explicit filename to this command is only necessary if the
documentation in the @file block refers to a file different from the
one the block resides in.
Originally committed as revision 22921 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-04-20 14:45:34 +00:00
Stefano Sabatini
72415b2adb
Define AVMediaType enum, and use it instead of enum CodecType, which
...
is deprecated and will be dropped at the next major bump.
Originally committed as revision 22735 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-03-30 23:30:55 +00:00
Carl Eugen Hoyos
bf9d70d5e4
Pass correct buffer-pointer and buffer-size to hardware accelerated
...
decoders when decoding packed B-frames.
Originally committed as revision 22149 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-03-02 17:12:41 +00:00
Carl Eugen Hoyos
8ef4f92b0d
Process packed bitstream also for VDPAU.
...
Originally committed as revision 22131 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-03-01 16:52:35 +00:00
Michael Niedermayer
b317567cf4
Change xvid/divx/lavc build variables to be consistent to x264_build.
...
Originally committed as revision 21682 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-02-08 00:43:15 +00:00
Michael Niedermayer
fc53b6afee
Split H263 encoder and decoder from common code.
...
Originally committed as revision 21109 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-01-09 14:59:06 +00:00
Michael Niedermayer
261a3c2d05
Move AVCodecs from h263dec.c to msmpeg4.c and disentangle init decode init.
...
Originally committed as revision 21102 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-01-08 19:40:10 +00:00
Michael Niedermayer
7213abf6ba
Use h263 tables in msmpeg4v1 dont duplicate them halfway.
...
Originally committed as revision 21101 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-01-08 19:10:11 +00:00
Michael Niedermayer
51ce2207c8
Add a few CONFIG_MPEG4_DECODER that should be there.
...
Originally committed as revision 21082 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-01-08 04:00:06 +00:00
Michael Niedermayer
ca334dd14b
Split the mpeg4 encoder and decoder off h263.c
...
Originally committed as revision 21079 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-01-07 23:53:49 +00:00
Michael Niedermayer
0b60f3bdf5
2 more if(CONFIG_*_DECODER)
...
Originally committed as revision 21055 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-01-07 06:32:34 +00:00
Michael Niedermayer
d7525cba23
Split out intel H263 decoder.
...
Originally committed as revision 21054 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-01-07 06:25:41 +00:00
Michael Niedermayer
a0b0d75368
Split flv decoding out.
...
Originally committed as revision 21051 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-01-07 05:36:45 +00:00
Michael Niedermayer
24b207b5a5
Adjust threshold for xvid packed b frame detection.
...
Also add xvid_build check.
If you note any packed bitstream regression, check this commit first and report it.
Fixes issue1652
Originally committed as revision 20997 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-01-01 21:32:48 +00:00
Michael Niedermayer
6c58758737
It appears s->bitstream_buffer_size has to be 0 at the end so rather use assert.
...
Originally committed as revision 20996 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-01-01 21:07:52 +00:00
Ronald S. Bultje
6e44ba1550
Use get_bits_left() instead of size_in_bits - get_bits_count().
...
Originally committed as revision 20543 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-11-16 17:42:43 +00:00
NVIDIA Corporation
70e0c871eb
Add VDPAU hardware accelerated decoding for MPEG-4 ASP which can be used
...
by video players.
Original patch by NVIDIA corporation.
Originally committed as revision 20502 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-11-10 18:52:39 +00:00
Stefano Sabatini
b0bef34209
Add additional long names for the Flash Video decoder and encoder.
...
Originally committed as revision 20317 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-10-19 18:45:44 +00:00
Diego Biurrun
7881793dd0
Remove unused debug av_log() calls.
...
Originally committed as revision 19549 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-07-30 20:57:41 +00:00
Baptiste Coudurier
87e302bfd8
remove unused hack which set AVCodecContext frame_number to pic timestamp
...
Originally committed as revision 18988 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-05-30 00:24:20 +00:00
David Conrad
580a7465fb
Add a chroma_sample_location field to define positioning of chroma samples
...
Originally committed as revision 18795 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-05-11 04:34:23 +00:00
Reimar Döffinger
238ef6dadd
Add a av_fast_malloc function and replace several uses of av_fast_realloc,
...
thus avoiding potential memleaks and pointless memcpys.
Originally committed as revision 18470 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-04-12 13:17:37 +00:00
Thilo Borgmann
7a00bbad21
Implement avcodec_decode_video2(), _audio3() and _subtitle2() which takes an
...
AVPacket argument rather than a const uint8_t *buf + int buf_size. This allows
passing of packet-specific flags from demuxer to decoder, such as the keyframe
flag, which appears necessary to playback corePNG P-frames.
Patch by Thilo Borgmann thilo.borgmann googlemail com, see also the thread
"Google Summer of Code participation" on the mailinglist.
Originally committed as revision 18351 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-04-07 15:59:50 +00:00
Diego Biurrun
0ffbc258aa
Change a bunch of codec long_names to be more consistent and descriptive.
...
Originally committed as revision 17716 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-03-02 05:18:33 +00:00
Gwenole Beauchesne
a4f3fdfa83
Use ff_hwaccel_pixfmt_list_420[] in H.263 decoder.
...
Patch by Gwenolé Beauchesne.
Originally committed as revision 17645 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-27 15:49:32 +00:00
Gwenole Beauchesne
1468d503a9
Add HW acceleration hooks for MPEG-4 / H.263 decoding.
...
Patch by Gwenole Beauchesne.
Originally committed as revision 17637 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-27 08:27:50 +00:00
Michael Niedermayer
a05aa821b6
add ff_find_hwaccel() by Gwenole Beauchesne
...
Originally committed as revision 17569 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-24 19:04:43 +00:00
Michael Niedermayer
f986c8e2e5
Another AVhwaccel hunk from Gwenole Beauchesne.
...
Originally committed as revision 17565 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-24 18:39:42 +00:00
Michael Niedermayer
09a9b45e4f
Add and use ff_pixfmt_list_420.
...
Originally committed as revision 17564 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-24 18:27:52 +00:00
Gwenole Beauchesne
c0aec489a6
Approved hunk from the AVHWaccel patch by Gwenole Beauchesne.
...
Originally committed as revision 17563 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-24 18:24:56 +00:00
Gwenole Beauchesne
40e5d31b57
More approved hunks for VAAPI & our new and cleaner hwaccel API.
...
patch by Gwenole Beauchesne gbeauchesne splitted-desktop com
Originally committed as revision 17540 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-23 13:44:51 +00:00
Kostya Shishkov
71a3dff9d5
Initialize s->gob_index for Intel variant of H.263 too
...
Originally committed as revision 17153 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-11 12:02:16 +00:00
Diego Biurrun
bad5537e2c
Use full internal pathname in doxygen @file directives.
...
Otherwise doxygen complains about ambiguous filenames when files exist
under the same name in different subdirectories.
Originally committed as revision 16912 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-01 02:00:19 +00:00
Stefano Sabatini
e1b6bdbb83
Change "H.263 Intel" long name to "Intel H.263".
...
Originally committed as revision 16808 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-01-26 19:46:47 +00:00
Stefano Sabatini
57be00bea7
Make more descriptive the long names for the various variants of H.263.
...
Originally committed as revision 16775 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-01-25 16:59:48 +00:00
Diego Biurrun
406792e7b0
cosmetics: Remove pointless period after copyright statement non-sentences.
...
Originally committed as revision 16684 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-01-19 15:46:40 +00:00
Aurelien Jacobs
2bb6eba21d
remove ff_get_fourcc() and use AV_RL32() instead
...
Originally committed as revision 16654 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-01-17 12:21:01 +00:00
Aurelien Jacobs
49fb20cb8a
replace all occurrence of ENABLE_ by the corresponding CONFIG_, HAVE_ or ARCH_
...
and remove all ENABLE_ definitions.
Originally committed as revision 16600 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-01-14 17:19:17 +00:00
Aurelien Jacobs
b250f9c66d
Change semantic of CONFIG_*, HAVE_* and ARCH_*.
...
They are now always defined to either 0 or 1.
Originally committed as revision 16590 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-01-13 23:44:16 +00:00
Michael Niedermayer
c62da7972b
Move CODEC_FLAG_LOW_DELAY into ff_mpeg4_decode_picture_header().
...
Originally committed as revision 16255 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-12-21 21:30:36 +00:00
Dominik Mierzejewski
82d1605fe7
Remove duplicated MM_* macros for CPU capabilities from dsputil.h.
...
Add missing one for FF_MM_ALTIVEC to avcodec.h.
Rename all the occurences of MM_* to the corresponding FF_MM_*.
Originally committed as revision 15770 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-11-03 18:08:00 +00:00
Michael Niedermayer
047599a4ba
Rename error_resilience to error_recognition.
...
Originally committed as revision 15270 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-09-08 18:18:49 +00:00
Diego Biurrun
ca74c0a180
cosmetics: Fix two common typos: wont --> will not, lets --> let us.
...
Originally committed as revision 14372 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-07-24 17:09:28 +00:00
Stefano Sabatini
fe4bf37455
Make AVCodec long_names definition conditional depending on CONFIG_SMALL.
...
Originally committed as revision 13759 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-06-12 21:50:13 +00:00
Robert Swain
34d71ebe94
Remove leading whitespace in long codec name that was committed in r13017
...
Originally committed as revision 13018 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-04-29 08:37:40 +00:00
Stefano Sabatini
6140271f54
Add some long names to AVCodec declarations.
...
patch by Stefano Sabatini, stefano.sabatini-lala poste it
Originally committed as revision 13017 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-04-29 07:24:44 +00:00
Stefano Sabatini
038f846e41
Add long names to some AVCodec declarations.
...
patch by Stefano Sabatini, stefano.sabatini-lala poste it
Originally committed as revision 13010 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-04-28 10:21:58 +00:00
Alexander Strange
f1ae14d20d
Xvid IDCTs are not under CONFIG_GPL, so don't require it when using them.
...
Originally committed as revision 12880 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-04-17 15:41:25 +00:00
Zuxy Meng
98a6fff98c
Apply 'cold' attribute to init/uninit functions in libavcodec
...
Originally committed as revision 12525 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-03-21 03:11:20 +00:00
Aurelien Jacobs
9701840bb5
add FF_ prefix to all (frame)_TYPE usage
...
Originally committed as revision 12399 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-03-09 23:31:02 +00:00
Aurelien Jacobs
0c291f2d0f
Avoid linking with h263 and mpeg4 find_frame_end()
...
when those codecs are not enabled.
Originally committed as revision 12332 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-03-05 14:46:51 +00:00
Michael Niedermayer
fbdad670e4
const
...
Originally committed as revision 11761 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-02-01 15:13:38 +00:00
Vitor Sessak
52b541ad79
spelling
...
Originally committed as revision 11122 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-12-01 22:21:04 +00:00
Michael Niedermayer
9abc7e0fdc
intrax8 decoder patch by "someone"
...
Originally committed as revision 10971 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-11-09 21:37:48 +00:00
Lord
58d1dc0e9b
Workaround adjustments for DivX 6.1 and later
...
patch by Lord: [ Lord_veryrandomD8 yahoo com ]
Originally committed as revision 9300 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-06-13 08:25:48 +00:00
Diego Biurrun
755bfeabcc
misc spelling fixes
...
Originally committed as revision 9289 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-06-12 09:29:25 +00:00
Aurelien Jacobs
1502555362
disable reference to msmpeg4 and wmv2 code when those codecs are not compiled in
...
Originally committed as revision 8975 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-05-10 13:11:36 +00:00
Aurelien Jacobs
df495dbd9a
move ff_mpeg4_find_frame_end() from h263dec.c to mpeg4video_parser.c
...
now h263dec depends on mpeg4video_parser
this fixes compilation when h263 decoder is disabled
Originally committed as revision 8962 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-05-09 23:13:43 +00:00
Diego Biurrun
c33d98141d
Move H.263 parser to its own file.
...
Originally committed as revision 8934 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-05-08 08:52:38 +00:00
Aurelien Jacobs
c53d2d9042
make some parser parameters const to avoid casting const to non-const
...
Originally committed as revision 8921 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-05-07 00:47:03 +00:00
Michel Bardiaux
bdb4b698d8
Corrections so that builds with DEBUG work
...
Originally committed as revision 8295 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-03-08 14:49:43 +00:00
Michael Niedermayer
b34397b4cd
1/0 fix
...
Originally committed as revision 7658 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-01-22 22:27:02 +00:00
Måns Rullgård
486497e07b
revert bad checkin
...
Originally committed as revision 7044 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-11-14 03:18:09 +00:00
Måns Rullgård
be6ed6fff4
move some CFLAGS settings away from config.* writing section
...
Originally committed as revision 7043 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-11-14 03:12:29 +00:00
Baptiste Coudurier
1766295516
add codec_tag and codec_stream_tag to MpegEncContext to not alter avctx values
...
Originally committed as revision 6930 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-11-07 09:46:57 +00:00
Steve L'Homme
949b1a13bf
Replace most of the %lld and %llx by their (cleaner) PRI*64 counterparts.
...
patch by Steve Lhomme, slhomme divxcorp com
Originally committed as revision 6868 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-11-01 22:39:58 +00:00
Diego Biurrun
b78e7197a8
Change license headers to say 'FFmpeg' instead of 'this program/this library'
...
and fix GPL/LGPL version mismatches.
Originally committed as revision 6577 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-10-07 15:30:46 +00:00
Loren Merritt
a1b13cf590
10l in r6412
...
Originally committed as revision 6547 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-10-04 02:57:43 +00:00
Loren Merritt
2833fc4646
approximate qpel functions: sacrifice some quality for some decoding speed. enabled on B-frames with -lavdopts fast.
...
Originally committed as revision 6412 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-10-01 21:25:17 +00:00
Mike Melanson
9bd0d79fcb
printf -> av_log, only occurs in DEBUG cases
...
Originally committed as revision 5934 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-08-04 22:51:20 +00:00
Måns Rullgård
af9e7d1810
--enable/disable parsers. Warning: some combinations are broken.
...
Originally committed as revision 5691 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-07-09 12:02:15 +00:00
Reimar Döffinger
c6bb50e002
Fix initialization of vc1_decoder (the same as wmv3_decoder).
...
Patch by Reimar Doeffinger.
Originally committed as revision 5544 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-06-29 11:17:50 +00:00
Michael Niedermayer
5430b070a8
cleanup picture / debug output code
...
Originally committed as revision 5140 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-03-10 20:40:52 +00:00
Steve L'Homme
267f7edcd1
(f)printf --> av_log conversion
...
taken from a patch by Steve L'Homme
Originally committed as revision 5127 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-03-08 11:43:10 +00:00
Michael Niedermayer
c2ca19d7f9
RMP4 ("xvid fork") decoding support
...
Originally committed as revision 5035 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-02-19 10:20:27 +00:00
Diego Biurrun
5509bffa88
Update licensing information: The FSF changed postal address.
...
Originally committed as revision 4842 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-01-12 22:43:26 +00:00
Michael Niedermayer
a2f3431fc4
also autodetect xvid idct if bitexact is used
...
Originally committed as revision 4761 to svn://svn.ffmpeg.org/ffmpeg/trunk
2005-12-21 15:51:45 +00:00
Michael Niedermayer
6baac1afd6
fix custom matrix permutation if xvid idct is autoselected and you have bad luck
...
Originally committed as revision 4750 to svn://svn.ffmpeg.org/ffmpeg/trunk
2005-12-18 02:23:19 +00:00
Diego Biurrun
115329f160
COSMETICS: Remove all trailing whitespace.
...
Originally committed as revision 4749 to svn://svn.ffmpeg.org/ffmpeg/trunk
2005-12-17 18:14:38 +00:00
Michael Niedermayer
ddabdfefa8
select xvid idct for xvid files if possible
...
Originally committed as revision 4573 to svn://svn.ffmpeg.org/ffmpeg/trunk
2005-09-10 17:09:54 +00:00
Michael Niedermayer
8c3eba7c62
skip_idct
...
skip_frame
skip_loop_filter
Originally committed as revision 4440 to svn://svn.ffmpeg.org/ffmpeg/trunk
2005-07-14 21:39:36 +00:00
Diego Biurrun
bb628dae44
spelling fixes
...
patch by Peter Robinson pbrobinson @ at @ gmail . dot . com and myself
Originally committed as revision 4382 to svn://svn.ffmpeg.org/ffmpeg/trunk
2005-06-17 15:02:53 +00:00
Michael Niedermayer
dee6dde669
avoid unneeded clear_blocks()
...
Originally committed as revision 4157 to svn://svn.ffmpeg.org/ffmpeg/trunk
2005-04-25 00:57:48 +00:00
Mike Melanson
160d679c07
Ministry of English Composition, reporting for duty (and the word is "skipped", not "skiped"; "skiped" would rhyme with "hyped")
...
Originally committed as revision 4153 to svn://svn.ffmpeg.org/ffmpeg/trunk
2005-04-24 17:21:11 +00:00
Michael Niedermayer
40c5fa2689
AVOption removial patch from (James A. Morrison >ja2morri csclub.uwaterloo ca>)
...
with minor changes from me
Originally committed as revision 4019 to svn://svn.ffmpeg.org/ffmpeg/trunk
2005-03-06 23:20:53 +00:00
anonymous
0d33db8a4d
In that patch:
...
- avctx and gb elements were removed from VC9Context, hence a larger diff
- some code was added to h263dec.c regarding CODEC_ID_WMV3 (should apply to CODEC_ID_VC9 too)
- VLC tables and other related tables were made global whenever this seemed necessary; appropriate changes were therefore made to other parts of the code using those tables
- the change for the bitplane management to a struct (some of them should eventually be mapped to MpegEncContext arrays) wasn't associated with the proper frees; should be fixed now
patch by anonymous
better names for globalized tables by me
Originally committed as revision 3905 to svn://svn.ffmpeg.org/ffmpeg/trunk
2005-01-30 16:34:57 +00:00
Michael Niedermayer
934982c4ac
avoid buf_size == 0 checks in every decoder
...
Originally committed as revision 3872 to svn://svn.ffmpeg.org/ffmpeg/trunk
2005-01-23 18:09:06 +00:00
Michael Niedermayer
0ecca7a49f
various security fixes and precautionary checks
...
Originally committed as revision 3822 to svn://svn.ffmpeg.org/ffmpeg/trunk
2005-01-12 00:16:25 +00:00
Michael Niedermayer
503a47255f
fix decoding of http://mplayerhq.hu/~diego/problem.mov
...
Originally committed as revision 3806 to svn://svn.ffmpeg.org/ffmpeg/trunk
2005-01-05 00:20:52 +00:00
Michael Niedermayer
4940ed6ae1
automatic workaround for another padding bug
...
Originally committed as revision 3678 to svn://svn.ffmpeg.org/ffmpeg/trunk
2004-11-13 01:05:12 +00:00
Michael Niedermayer
45cb4767bc
xvid fake divx version workaround
...
Originally committed as revision 3595 to svn://svn.ffmpeg.org/ffmpeg/trunk
2004-10-15 11:48:50 +00:00
Michael Niedermayer
cfeae977a7
10l (wrong variable)
...
Originally committed as revision 3537 to svn://svn.ffmpeg.org/ffmpeg/trunk
2004-09-28 23:31:59 +00:00
Michael Niedermayer
21adafec2a
lowres width/height cleanup 3rd try
...
Originally committed as revision 3522 to svn://svn.ffmpeg.org/ffmpeg/trunk
2004-09-27 11:50:56 +00:00
Michael Niedermayer
4f8a831994
set AVCodecContext.width/height to the picture width/height instead of the one stored in the bitstream (that only matters if lowres!=0)
...
Originally committed as revision 3518 to svn://svn.ffmpeg.org/ffmpeg/trunk
2004-09-27 02:39:55 +00:00
Michael Niedermayer
af2a9e8fdb
lowres slice fix
...
Originally committed as revision 3513 to svn://svn.ffmpeg.org/ffmpeg/trunk
2004-09-26 13:03:43 +00:00
Alex Beregszaszi
b442a92f85
10l, non-x86 fix
...
Originally committed as revision 3254 to svn://svn.ffmpeg.org/ffmpeg/trunk
2004-06-26 09:52:16 +00:00
Michael Niedermayer
ee0c00d3b4
use libmpeg2 idct to decode xvid videos unless the user forced some other idct
...
Originally committed as revision 3251 to svn://svn.ffmpeg.org/ffmpeg/trunk
2004-06-25 19:14:23 +00:00
Michael Niedermayer
676e61c7bb
infinite loop fix
...
Originally committed as revision 3188 to svn://svn.ffmpeg.org/ffmpeg/trunk
2004-06-03 14:17:59 +00:00
Michael Niedermayer
53db1cae1c
data_size = 0 cleanup
...
Originally committed as revision 3146 to svn://svn.ffmpeg.org/ffmpeg/trunk
2004-05-21 14:37:16 +00:00
Michael Niedermayer
4ccde216cd
support decoding mpeg4 with buggy dc clipping
...
Originally committed as revision 3108 to svn://svn.ffmpeg.org/ffmpeg/trunk
2004-05-05 19:53:40 +00:00
Michael Niedermayer
e4cb187db8
remove duplicated find_frame_end() code
...
move codec specific code from parser.c -> <codecname>.c as far as its easily possible
Originally committed as revision 3087 to svn://svn.ffmpeg.org/ffmpeg/trunk
2004-04-29 14:21:33 +00:00
Michael Niedermayer
e4a1fdfdee
segfault fix
...
Originally committed as revision 3017 to svn://svn.ffmpeg.org/ffmpeg/trunk
2004-04-16 01:02:39 +00:00
Michael Niedermayer
b44bdf7eec
interlaced chroma MC divx-bug workaround
...
Originally committed as revision 2947 to svn://svn.ffmpeg.org/ffmpeg/trunk
2004-04-02 19:54:33 +00:00