virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-11-26 19:01:44 +02:00
Code Issues Releases Activity
43,309 Commits 37 Branches 400 Tags 460 MiB
7a72695c05
Commit Graph

43309 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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>
 2012-08-07 22:45:46 +02:00
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>
 2012-08-07 22:34:10 +02:00
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>
 2012-08-07 22:34:10 +02:00
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>
 2012-08-07 21:49:00 +02:00
Michael Niedermayer
0049af2628 pnmdec: make ff_pnm_decode_header() more robust 
Fixes ticket1321

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-08-07 21:06:40 +02:00
Michael Niedermayer
bb7744a45b pnmdec: make pnm_get more robust 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-08-07 21:06:40 +02:00
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>
 2012-08-07 21:06:40 +02:00
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>
 2012-08-07 20:06:56 +02:00
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.
 2012-08-07 20:04:19 +02:00
Michael Niedermayer
8993c25695 avidec: fix AVStream.info memleak with dv. 
Fixes Ticket1334

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-08-07 19:18:53 +02:00
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>
 2012-08-07 17:59:19 +02:00
Anton Khirnov
36ef5369ee Replace all CODEC_ID_* with AV_CODEC_ID_* 2012-08-07 16:00:24 +02:00
Anton Khirnov
104e10fb42 lavc: add AV prefix to codec ids. 2012-08-07 15:56:39 +02:00
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>
 2012-08-07 12:39:04 +01:00
Michael Niedermayer
7febc5aa93 arm: fix compile with disable-optimizations on android 
Fixes Ticket1241

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-08-07 13:31:40 +02:00
Clément Bœsch
cf753d5b59 doc: fix misspelled "convergence". 
Found-by: David Rice
 2012-08-07 07:37:39 +02:00
Paul B Mahol
011ce89dba avcodec: add bmp parser 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2012-08-07 03:15:39 +00:00
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>
 2012-08-07 04:45:06 +02:00
Michael Niedermayer
3865ec2ace proresenc_kostya: do not attempt to free random things 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-08-07 01:11:28 +02:00
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>
 2012-08-07 00:18:59 +02:00
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>
 2012-08-06 22:22:37 +02:00
Michael Niedermayer
a80ce390df avidec: parse INFO tags at the end 
Fixes Ticket1123

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-08-06 21:36:42 +02:00
Justin Ruggles
fdbeae4490 mpc8: add a flush function 
Ensures that the next frame decoded after seeking will be decoded as a
keyframe.
 2012-08-06 14:39:21 -04:00
Justin Ruggles
2fa57c9daf mpc8: set packet duration and stream start time instead of tracking frames 
Fixes mpc8 timestamps.
 2012-08-06 14:39:21 -04:00
Michael Niedermayer
21eafa18e6 msrle: fix extradata palette handling 
Fixes Ticket1273

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-08-06 19:39:11 +02:00
Diego Biurrun
cf22705e87 nuv: K&R formatting cosmetics 2012-08-06 19:03:33 +02:00
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>
 2012-08-06 17:43:29 +01:00
Nicolas George
d74ade7d5f ffprobe: refactor frames decoding. 2012-08-06 17:37:59 +02:00
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>
 2012-08-06 16:49:49 +02:00
Michael Niedermayer
e6690b6a56 mpegvideo.c: convert some asserts to av_assert 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-08-06 16:40:22 +02:00
Michael Niedermayer
3e0b4e32c9 svq1enc: set picture_structure correctly 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-08-06 16:28:13 +02:00
Michael Niedermayer
f8dbbe5464 mpegvideo_enc: switch some assert to av_assert 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-08-06 14:41:16 +02:00
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>
 2012-08-06 14:41:16 +02:00
Janne Grunau
859a579e9b nuv: check RTjpeg header for validity 
CC: libav-stable@libav.org
 2012-08-06 14:34:12 +02:00
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
 2012-08-06 14:33:50 +02:00
Mans Rullgard
b40ea0f41d imc: remove unused field IMCContext.one_div_log2 
Signed-off-by: Mans Rullgard <mans@mansr.com>
 2012-08-06 10:20:48 +01:00
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>
 2012-08-06 10:20:42 +01:00
Mans Rullgard
2b6804328e imc: remove empty if() block 
Signed-off-by: Mans Rullgard <mans@mansr.com>
 2012-08-06 10:20:11 +01:00
Mans Rullgard
add8f5eab7 fate: simplify variable setting filter.mak 
This removes some needless indirection and duplication.

Signed-off-by: Mans Rullgard <mans@mansr.com>
 2012-08-06 10:19:27 +01:00
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.
 2012-08-06 10:06:26 +02:00
Michael Niedermayer
e6b9903d82 shorten: fix cmd type 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-08-06 09:24:59 +02:00
Paul B Mahol
9c1619b5fe mpc7: remove duplicated definitions 
They are available in mpc.h

Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2012-08-06 01:33:37 +00:00
Michael Niedermayer
7bf16ec300 mpc8: fix pts 
Fixes Ticket1254

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-08-06 02:51:11 +02:00
Michael Niedermayer
e4b53d995c mov: dont clip timestamps at 0 
Fixes Ticket1251

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-08-06 01:38:18 +02:00
Paul B Mahol
958df52ae0 configure: make libtwolame check more robust 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2012-08-05 23:33:36 +00:00
Piotr Bandurski
68f4156f44 movenv: fix remuxing of qdm2 2012-08-06 00:37:28 +02:00
Piotr Bandurski
1b72a7e8a9 aiffenc: fix remuxing of qdm2 2012-08-06 00:08:53 +02:00
Clément Bœsch
16dc5f2050 Replace various inlined inverse AVRational with av_inv_q(). 2012-08-06 00:04:36 +02:00
Clément Bœsch
ad55244c96 lavfi/overlay: remove dead initialization. 2012-08-06 00:04:36 +02:00
Piotr Bandurski
5d2f89a23c movenc: fix remuxing of svq3 2012-08-05 23:58:10 +02:00