Michael Niedermayer
7a72695c05
Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85'
...
* commit '36ef5369ee9b336febc2c270f8718cec4476cb85':
Replace all CODEC_ID_* with AV_CODEC_ID_*
lavc: add AV prefix to codec ids.
Conflicts:
doc/APIchanges
doc/examples/decoding_encoding.c
doc/examples/muxing.c
ffmpeg.c
ffprobe.c
ffserver.c
libavcodec/8svx.c
libavcodec/avcodec.h
libavcodec/dnxhd_parser.c
libavcodec/dvdsubdec.c
libavcodec/error_resilience.c
libavcodec/h263dec.c
libavcodec/libvorbisenc.c
libavcodec/mjpeg_parser.c
libavcodec/mjpegenc.c
libavcodec/mpeg12.c
libavcodec/mpeg4videodec.c
libavcodec/mpegvideo.c
libavcodec/mpegvideo_enc.c
libavcodec/pcm.c
libavcodec/r210dec.c
libavcodec/utils.c
libavcodec/v210dec.c
libavcodec/version.h
libavdevice/alsa-audio-dec.c
libavdevice/bktr.c
libavdevice/v4l2.c
libavformat/asfdec.c
libavformat/asfenc.c
libavformat/avformat.h
libavformat/avidec.c
libavformat/caf.c
libavformat/electronicarts.c
libavformat/flacdec.c
libavformat/flvdec.c
libavformat/flvenc.c
libavformat/framecrcenc.c
libavformat/img2.c
libavformat/img2dec.c
libavformat/img2enc.c
libavformat/ipmovie.c
libavformat/isom.c
libavformat/matroska.c
libavformat/matroskadec.c
libavformat/matroskaenc.c
libavformat/mov.c
libavformat/movenc.c
libavformat/mp3dec.c
libavformat/mpeg.c
libavformat/mpegts.c
libavformat/mxf.c
libavformat/mxfdec.c
libavformat/mxfenc.c
libavformat/nsvdec.c
libavformat/nut.c
libavformat/oggenc.c
libavformat/pmpdec.c
libavformat/rawdec.c
libavformat/rawenc.c
libavformat/riff.c
libavformat/sdp.c
libavformat/utils.c
libavformat/vocenc.c
libavformat/wtv.c
libavformat/xmv.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
13 years ago
jamal
49440853d0
build: Fix some paths in uninstall-libs
...
Folder and file names weren't being separated with a slash.
This resulted in .dll.a, .lib and .def files not being removed on uninstall.
Signed-off-by: Alexander Strasser <eclipse7@gmx.net>
13 years ago
jamal
7c5466d4fc
checkheaders: Fix directory creation in out-of-tree builds.
...
checkheaders wasn't creating folders as needed, so if it was run
immediately after the configure script it would fail as soon as
it tried to compile headers inside the ARCH folders.
Signed-off-by: Alexander Strasser <eclipse7@gmx.net>
13 years ago
Michael Niedermayer
bc773d0d42
Merge commit 'f5d2c597e99af218b0d4d1cf9737c7e68ee934e4'
...
* commit 'f5d2c597e99af218b0d4d1cf9737c7e68ee934e4':
build: fix library installation on cygwin
mpc8: add a flush function
mpc8: set packet duration and stream start time instead of tracking frames
Conflicts:
libavformat/mpc8.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
13 years ago
Michael Niedermayer
0049af2628
pnmdec: make ff_pnm_decode_header() more robust
...
Fixes ticket1321
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
13 years ago
Michael Niedermayer
bb7744a45b
pnmdec: make pnm_get more robust
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
13 years ago
Derek Buitenhuis
9b34ae4a65
configure: Add support for e500mc CPU
...
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
13 years ago
Paul B Mahol
13c5069187
lavfi: add smptebars source
...
Patch readapted by Stefano Sabatini, color values proposed by Tim
Nicholson <nichot20@yahoo.com>.
Address trac ticket #1462 .
See thread:
Subject: [FFmpeg-devel] [PATCH] smptebars filter
Date: Wed, 20 Jun 2012 01:54:58 +0000
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Stefano Sabatini <stefasab@gmail.com>
13 years ago
Stefano Sabatini
13bbc464ed
examples/muxing: set codec in the codec context
...
Make add_{audio,video}_stream return the found codec, and pass it to
avcodec_open2() through open_{audio,video} functions.
Fix failure:
No codec provided to avcodec_open2().
could not open codec
This is also consistent with the use of the avcodec_open2() API in the
codebase.
13 years ago
Michael Niedermayer
8993c25695
avidec: fix AVStream.info memleak with dv.
...
Fixes Ticket1334
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
13 years ago
Michael Niedermayer
2f6f2f4f73
mpeg12dec: move checks out of decode picture coding extension.
...
Fixes out of array reads
Fixes Ticket1330
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
13 years ago
Anton Khirnov
36ef5369ee
Replace all CODEC_ID_* with AV_CODEC_ID_*
13 years ago
Anton Khirnov
104e10fb42
lavc: add AV prefix to codec ids.
13 years ago
Yaakov Selkowitz
f5d2c597e9
build: fix library installation on cygwin
...
This installs libraries using the proper names and locations,
generates an import lib for the DLL, and drops no longer needed
linker flags.
Signed-off-by: Mans Rullgard <mans@mansr.com>
13 years ago
Michael Niedermayer
7febc5aa93
arm: fix compile with disable-optimizations on android
...
Fixes Ticket1241
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
13 years ago
Clément Bœsch
cf753d5b59
doc: fix misspelled "convergence".
...
Found-by: David Rice
13 years ago
Paul B Mahol
011ce89dba
avcodec: add bmp parser
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
13 years ago
Michael Niedermayer
29d1df66ad
mpegaudiodec: replace assert() by check under #ifdef DEBUG
...
The assert can be false with some invalid inputs, the check is
too expensive to always do though for just a warning message.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
13 years ago
Michael Niedermayer
3865ec2ace
proresenc_kostya: do not attempt to free random things
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
13 years ago
Michael Niedermayer
cde4741177
h264: disable assert on current_picture_ptr being null.
...
It is possible in various error pathes as well as gap handling
that this has already been allocated. Its not clear why that
would be a problem with the current code, thus disable the
assert to avoid common assert failure when asserts are enabled.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
13 years ago
Michael Niedermayer
7ae473e8a0
Merge remote-tracking branch 'qatar/master'
...
* qatar/master:
nuv: K&R formatting cosmetics
build: generalise rules and variable settings for av* programs
nuv: check RTjpeg header for validity
Revert "nuv: check per-frame header for validity."
imc: remove unused field IMCContext.one_div_log2
imc: fix size of a memset()
imc: remove empty if() block
fate: simplify variable setting filter.mak
lavf: Declare an AVRational struct without a struct literal
Conflicts:
Makefile
configure
libavcodec/nuv.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
13 years ago
Michael Niedermayer
a80ce390df
avidec: parse INFO tags at the end
...
Fixes Ticket1123
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
13 years ago
Justin Ruggles
fdbeae4490
mpc8: add a flush function
...
Ensures that the next frame decoded after seeking will be decoded as a
keyframe.
13 years ago
Justin Ruggles
2fa57c9daf
mpc8: set packet duration and stream start time instead of tracking frames
...
Fixes mpc8 timestamps.
13 years ago
Michael Niedermayer
21eafa18e6
msrle: fix extradata palette handling
...
Fixes Ticket1273
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
13 years ago
Diego Biurrun
cf22705e87
nuv: K&R formatting cosmetics
13 years ago
Mans Rullgard
baac24e680
build: generalise rules and variable settings for av* programs
...
This simplifies adding extra flags for individual programs
and also allows more than one object file per program.
Signed-off-by: Mans Rullgard <mans@mansr.com>
13 years ago
Nicolas George
d74ade7d5f
ffprobe: refactor frames decoding.
13 years ago
Michael Niedermayer
610c67df37
mpegvideo: remove last_picture_ptr / h264 assert.
...
This assert is no longer true since h264 error concealment needs
last_picture_ptr to be set.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
13 years ago
Michael Niedermayer
e6690b6a56
mpegvideo.c: convert some asserts to av_assert
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
13 years ago
Michael Niedermayer
3e0b4e32c9
svq1enc: set picture_structure correctly
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
13 years ago
Michael Niedermayer
f8dbbe5464
mpegvideo_enc: switch some assert to av_assert
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
13 years ago
Michael Niedermayer
f72e0d9a9f
mpegvideo_enc: remove assert that has become obsolete with the new API
...
it now just checks uninitialized and unused data.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
13 years ago
Janne Grunau
859a579e9b
nuv: check RTjpeg header for validity
...
CC: libav-stable@libav.org
13 years ago
Janne Grunau
110d015ad4
Revert "nuv: check per-frame header for validity."
...
The check is bogus since the nuv frameheader is already skipped
and the (decompressed) RTjpeg header is checked.
This reverts commit f6afacdb3b
.
CC: libav-stable@libav.org
13 years ago
Mans Rullgard
b40ea0f41d
imc: remove unused field IMCContext.one_div_log2
...
Signed-off-by: Mans Rullgard <mans@mansr.com>
13 years ago
Mans Rullgard
bc90230b98
imc: fix size of a memset()
...
IMCContext was changed from an array to a pointer in 66b84e4
,
but this memset() was not updated.
Signed-off-by: Mans Rullgard <mans@mansr.com>
13 years ago
Mans Rullgard
2b6804328e
imc: remove empty if() block
...
Signed-off-by: Mans Rullgard <mans@mansr.com>
13 years ago
Mans Rullgard
add8f5eab7
fate: simplify variable setting filter.mak
...
This removes some needless indirection and duplication.
Signed-off-by: Mans Rullgard <mans@mansr.com>
13 years ago
anonymous
388243bb27
udp: do not call pthread_{mutex,cond}_destroy when not initialized.
...
This seems to cause a crash on Windows.
The author of that patch was a random guy on IRC who wants to stay anonymous.
13 years ago
Michael Niedermayer
e6b9903d82
shorten: fix cmd type
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
13 years ago
Paul B Mahol
9c1619b5fe
mpc7: remove duplicated definitions
...
They are available in mpc.h
Signed-off-by: Paul B Mahol <onemda@gmail.com>
13 years ago
Michael Niedermayer
7bf16ec300
mpc8: fix pts
...
Fixes Ticket1254
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
13 years ago
Michael Niedermayer
e4b53d995c
mov: dont clip timestamps at 0
...
Fixes Ticket1251
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
13 years ago
Paul B Mahol
958df52ae0
configure: make libtwolame check more robust
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
13 years ago
Piotr Bandurski
68f4156f44
movenv: fix remuxing of qdm2
13 years ago
Piotr Bandurski
1b72a7e8a9
aiffenc: fix remuxing of qdm2
13 years ago
Clément Bœsch
16dc5f2050
Replace various inlined inverse AVRational with av_inv_q().
13 years ago
Clément Bœsch
ad55244c96
lavfi/overlay: remove dead initialization.
13 years ago
Piotr Bandurski
5d2f89a23c
movenc: fix remuxing of svq3
13 years ago