generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
43,491 Commits 24 Branches 241 Tags 173 MiB
ed8d827ad0
Commit Graph

44 Commits

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
Michael Niedermayer
9fb08427d7 vf_pp: dont pass NULL into pp, it would fail 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-07-07 19:14:51 +02:00
Michael Niedermayer
1c60088885 Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  x86: Only use optimizations with cmov if the CPU supports the instruction
  x86: Add CPU flag for the i686 cmov instruction
  x86: remove unused inline asm macros from dsputil_mmx.h
  x86: move some inline asm macros to the only places they are used
  lavfi: Add the af_channelmap audio channel mapping filter.
  lavfi: add join audio filter.
  lavfi: allow audio filters to request a given number of samples.
  lavfi: support automatically inserting the fifo filter when needed.
  lavfi/audio: eliminate ff_default_filter_samples().

Conflicts:
	Changelog
	libavcodec/x86/h264dsp_mmx.c
	libavfilter/Makefile
	libavfilter/allfilters.c
	libavfilter/avfilter.h
	libavfilter/avfiltergraph.c
	libavfilter/version.h
	libavutil/x86/cpu.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2012-06-24 02:09:53 +02:00
J. Bohl
023c073076 add bracket around the argument (fixes compilation error with ICL) 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-06-09 00:34:21 +02:00
Paul B Mahol
2cda0429aa lavfi: remove screenshot libmpcodecs wrapper 
The filter is useless.

Signed-off-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-05-02 18:15:29 +02:00
Stefano Sabatini
9750254885 lavfi/mp: remove libmpcodecs mirror filter 
The native libavfilter hflip filter does the same thing.
 2012-04-20 01:01:24 +02:00
Stefano Sabatini
5eeecde859 lavfi/mp: remove 2xsai wrapped filter 
It was ported to a native libavfilter filter.
 2012-04-13 00:14:06 +02:00
Stefano Sabatini
6cb01c9dba lavfi/mp: remove remove_logo wrapper 
removelogo has been ported to libavfilter, and the wrapper was not
working.
 2012-04-07 13:57:39 +02:00
Michael Niedermayer
9e2ee46206 vf_fspp: add ff_ prefix to non static variables. 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-03-14 23:06:00 +01:00
Baptiste Coudurier
fa35ade8f9 vf_fspp: fix compilation with llvm 2012-03-14 22:35:15 +01:00
Stefano Sabatini
aefd1cb725 lavfi: remove swapuv libmpcodecs wrapper 
The filter has been ported to a native libavfilter filter.
 2012-03-10 00:10:44 +01:00
Nicolas George
14aa1ba802 libmpcodecs/vf_pp: import memleak fix from MPlayer. 2012-03-04 19:36:24 +01:00
Michael Niedermayer
02670762d2 libavfilter/libmpcodecs: add vf_pp from current mplayer svn 
This will allow us to do regression tests on libpostproc.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-02-26 20:39:32 +01:00
Clément Bœsch
c84acc31b2 Revert "vf_fspp: use LOCAL_MANGLE instead of MANGLE." 
This reverts commit 1aa8f5fcfb. It broke
the other x86_32 fate instances.
 2012-02-08 23:16:32 +01:00
Clément Bœsch
1aa8f5fcfb vf_fspp: use LOCAL_MANGLE instead of MANGLE. 
The symbols are locals, thus the EXTERN_PREFIX should be omitted. This
might fix the llvm-gcc fate instance.
 2012-02-08 19:45:39 +01:00
Clément Bœsch
23b639c44f Fix "ouput" typo and add a check. 2012-01-28 11:04:19 +01:00
Michael Niedermayer
e37f161e66 Merge remote-tracking branch 'qatar/master' 
* qatar/master: (71 commits)
  movenc: Allow writing to a non-seekable output if using empty moov
  movenc: Support adding isml (smooth streaming live) metadata
  libavcodec: Don't crash in avcodec_encode_audio if time_base isn't set
  sunrast: Document the different Sun Raster file format types.
  sunrast: Add a check for experimental type.
  libspeexenc: use AVSampleFormat instead of deprecated/removed SampleFormat
  lavf: remove disabled FF_API_SET_PTS_INFO cruft
  lavf: remove disabled FF_API_OLD_INTERRUPT_CB cruft
  lavf: remove disabled FF_API_REORDER_PRIVATE cruft
  lavf: remove disabled FF_API_SEEK_PUBLIC cruft
  lavf: remove disabled FF_API_STREAM_COPY cruft
  lavf: remove disabled FF_API_PRELOAD cruft
  lavf: remove disabled FF_API_NEW_STREAM cruft
  lavf: remove disabled FF_API_RTSP_URL_OPTIONS cruft
  lavf: remove disabled FF_API_MUXRATE cruft
  lavf: remove disabled FF_API_FILESIZE cruft
  lavf: remove disabled FF_API_TIMESTAMP cruft
  lavf: remove disabled FF_API_LOOP_OUTPUT cruft
  lavf: remove disabled FF_API_LOOP_INPUT cruft
  lavf: remove disabled FF_API_AVSTREAM_QUALITY cruft
  ...

Conflicts:
	doc/APIchanges
	libavcodec/8bps.c
	libavcodec/avcodec.h
	libavcodec/libx264.c
	libavcodec/mjpegbdec.c
	libavcodec/options.c
	libavcodec/sunrast.c
	libavcodec/utils.c
	libavcodec/version.h
	libavcodec/x86/h264_deblock.asm
	libavdevice/libdc1394.c
	libavdevice/v4l2.c
	libavformat/avformat.h
	libavformat/avio.c
	libavformat/avio.h
	libavformat/aviobuf.c
	libavformat/dv.c
	libavformat/mov.c
	libavformat/utils.c
	libavformat/version.h
	libavformat/wtv.c
	libavutil/Makefile
	libavutil/file.c
	libswscale/x86/input.asm
	libswscale/x86/swscale_mmx.c
	libswscale/x86/swscale_template.c
	tests/ref/lavf/ffm

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2012-01-28 07:53:34 +01:00
Reimar Döffinger
96949dafcc Replace all strcasecmp/strncasecmp usages. 
All current usages of it are incompatible with localization.
For example strcasecmp("i", "I") != 0 is possible, but would
break many of the places where it is used.
Instead use our own implementations that always treat the data
as ASCII.

Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
 2011-11-03 19:25:26 +01:00
Michael Niedermayer
7491816010 libavfilter/libmpcodecs: add vf_stereo3d support 
(code from mplayer see their svn for detailed authorship)
parameters must be integers as we do not have mplayers parser
also the stuff passed to it through non constant globals is not supported
this should be fixed in mplayer first.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-09-20 05:49:42 +02:00
Michael Niedermayer
5aa18fed84 libmpcodecs: some hunks from mplayer HEAD 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-09-20 05:14:52 +02:00
Michael Niedermayer
39e0accb7a vf_remove_logo: domt access vf->next->query_format() directly but use the API. 
This fixes a crash

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-09-13 03:52:30 +02:00
Stefano Sabatini
6e89bdfecf lavfi: remove delogo mp wrapper 
The delogo filter has been natively integrated into libavfilter,
simplify.
 2011-08-14 12:26:44 +02:00
Stefano Sabatini
e72657f83d lavfi: remove mp test wrapper 
The source was natively integrated into libavfilter, with the name
mptestsrc.
 2011-08-11 16:19:53 +02:00
Stefano Sabatini
640a905ece lavfi: remove gradfun mp wrapper 
The gradfun filter was already integrated natively in libavfilter.
Both filters issue the same output, and have a comparable performance.

See thread:
Subject: [FFmpeg-devel] [PATCH] lavfi: remove gradfun mp wrapper
Date: Fri,  5 Aug 2011 00:19:04 +0200
 2011-08-07 17:43:02 +02:00
Stefano Sabatini
cc0dc50d02 vf_mp: remove blackframe filter wrapper 
blackframe is integrated as a native filter.
 2011-07-23 10:55:50 +02:00
Stefano Sabatini
8c2863b87f vf_mp: remove cropdetect wrapper 
The cropdetect filter is natively integrated into libavfilter.
 2011-07-21 13:04:48 +02:00
Stefano Sabatini
b43ca2deb6 vf_mp: remove rgbtest wrapper 
The filter was integrated natively into libavfilter as a source with
name rgbtestsrc.
 2011-07-15 01:44:57 +02:00
Stefano Sabatini
4bd28579e5 vf_mp: remove boxblur wrapper 
It is natively included in libavfilter.
 2011-07-15 01:06:00 +02:00
Reimar Döffinger
58fd70b04d Port remove of get_sws_cpuflags from MPlayer's libmpcodecs. 2011-06-02 08:38:09 +02:00
Reimar Döffinger
3379531c40 Port recent changes to MPlayer libmpcodecs. 
Also include an older fix for vf_smartblur which was essentially
broken due to reading the threshold value wrongly.
 2011-06-02 08:38:09 +02:00
Reimar Döffinger
2a30df09fd Replace non-existent HAVE_SSE2 with HAVE_SSE. 
Since this is only a compilation check (the actual function used is
selected at runtime) and HAVE_SSE indicates that we can also compile
SSE2 code, this is correct.
 2011-06-02 08:38:08 +02:00
Reimar Döffinger
a52f598d63 Port libmpcodec fixes from MPlayer. 2011-05-31 07:40:20 +02:00
Michael Niedermayer
6841c8c579 Merge remote branch 'qatar/master' 
* qatar/master:
  log: Fix an oob array read.
  cosmetics: trim trailing whitespace in postproc
  Ban strncpy() it's too easy to misuse.
  psymodel: Remove wrapper functions.
  aacenc: Replace loop counters in aac_encode_frame() with more descriptive 'ch' and 'w'.
  regtest: remove redundant flags in jpg test
  regtest: use run_ffmpeg in do_image_formats
  regtest: simplify encoding functions
  ffmpeg.c: check for interlaced flag in the correct place.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2011-05-09 04:50:56 +02:00
Stefano Sabatini
e40cfb1463 mp: remove use of deprecated old eval API 
The old API was deprecated and will be possibly removed, fix warnings
in libavfilter/libmpcodecs/vf_geq.c and libavfilter/libmpcodecs/vf_qp.c.

Signed-off-by: Stefano Sabatini <stefano.sabatini-lala@poste.it>
 2011-04-21 18:45:56 +02:00
Reimar Döffinger
0bfe349d4a Update to latest MPlayer version. 
Avoids warnings due to pointlessly casting away const.
 2011-03-25 19:05:02 +01:00
j@v2v.cc
3660b5bca9 remove definition of swab 
right now swab is defined in libavfilter/libmpcodecs/mpbswap.h
this breaks mingw32 cross compiles. since it its not used, it should be
removed. alternatively swab has to be added to HAVE_LIST in configure.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-03-17 19:09:45 +01:00
Baptiste Coudurier
69aab68037 Use av_strdup instead of strdup, fixes mingw build 2011-03-16 14:26:25 -07:00
Michael Niedermayer
55fa97e215 Remove useage of memalign() from libmpcodecs, not all platforms have memalign(). 2011-01-28 21:55:23 +01:00
Michael Niedermayer
a61b0df708 Add ASMALIGN() hack to patch around its recent removial from configure 2011-01-20 03:27:01 +01:00
Michael Niedermayer
3be78f7ecd Hack libmpcodecs to make it buildable. 2011-01-20 00:59:30 +01:00
Michael Niedermayer
8e45c103e9 Remove dependancy of m_option & m_struct from libmpcodecs. 2011-01-20 00:57:33 +01:00
Michael Niedermayer
4d46361425 Avoid dependancy on global variable verbose in libmpcodecs/vf_pullup.c 2011-01-20 00:52:26 +01:00
Michael Niedermayer
45c889a3ad Add #define _BSD_SOURCE where mplayer is not C99. 2011-01-20 00:50:42 +01:00
Michael Niedermayer
e4852fb38d Add MPlayers libmpcodecs, this will be needed for our libavfilter wraper for it. 2011-01-20 00:49:27 +01:00