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

51071 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Michael Niedermayer
87d263a122 Merge commit 'c2597c5a0a08526493abb9bc9544b61a290fe20f' 
* commit 'c2597c5a0a08526493abb9bc9544b61a290fe20f':
  h264_refs: cosmetics, reformat

Conflicts:
	libavcodec/h264_refs.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-03-13 13:28:29 +01:00
Michael Niedermayer
6c3e4e391d Merge commit 'f08fefc4d099f2a1f2e3a6db3d340537e601f762' 
* commit 'f08fefc4d099f2a1f2e3a6db3d340537e601f762':
  h264: remove a useless svq3 condition
  mpegvideo: remove FMT_H264

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-03-13 13:17:49 +01:00
Michael Niedermayer
72ad824a86 Merge remote-tracking branch 'cehoyos/master' 
* cehoyos/master:
  avframe: Copy buffer type in copy_props.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-03-13 13:12:11 +01:00
Michael Niedermayer
df4517106a Merge commit 'ee8704916de79158da8a48a9ea5be819e83d23ba' 
* commit 'ee8704916de79158da8a48a9ea5be819e83d23ba':
  mpegvideo: reindent

Conflicts:
	libavcodec/mpegvideo.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-03-13 13:08:04 +01:00
Carl Eugen Hoyos
f1b716c79b avframe: Copy buffer type in copy_props. 
Fixes VDPAU decoding with MPlayer.
 2013-03-13 13:05:42 +01:00
Michael Niedermayer
f45fdb123f Merge commit '19cac8e301419dcde31526d15196a952ddf2c4c7' 
* commit '19cac8e301419dcde31526d15196a952ddf2c4c7':
  mpegvideo: remove useless references to h264 and svq3

Conflicts:
	libavcodec/mpegvideo.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-03-13 12:56:43 +01:00
Michael Niedermayer
b2e0c9dd34 Merge commit '85a5bc054c1290699ccbf5799ba6c4e2fbcc3530' 
* commit '85a5bc054c1290699ccbf5799ba6c4e2fbcc3530':
  lavf: remove disabled FF_API_R_FRAME_RATE cruft

Conflicts:
	libavformat/avformat.h
	libavformat/electronicarts.c
	libavformat/rawdec.c
	libavformat/utils.c
	libavformat/version.h

The field is in use and no semantically equivalent field is available,
thus not removed

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-03-13 12:55:00 +01:00
Michael Niedermayer
acbd14bc7e avformat: postpone API removials where the functions are trivial wrapers 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-03-13 12:43:02 +01:00
Michael Niedermayer
06a8350599 Merge commit '7b486ab13bfcfa88a7cd92586de50e49966ec292' 
* commit '7b486ab13bfcfa88a7cd92586de50e49966ec292':
  lavf: remove disabled FF_API_AV_GETTIME cruft
  lavf: remove disabled FF_API_INTERLEAVE_PACKET cruft

Conflicts:
	libavformat/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-03-13 12:37:03 +01:00
Michael Niedermayer
256e1f7bdf Merge commit '435c2a31ad5eead20eda1152097f60c3bfa22847' 
* commit '435c2a31ad5eead20eda1152097f60c3bfa22847':
  lavf: remove disabled FF_API_READ_PACKET cruft

Conflicts:
	libavformat/version.h

Removial postponed as wraper is trivial

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-03-13 12:34:06 +01:00
Michael Niedermayer
1c60956c80 Merge commit 'c7e044c61bb08b3a6e1e8063e8f4449c88b01201' 
* commit 'c7e044c61bb08b3a6e1e8063e8f4449c88b01201':
  lavf: remove disabled FF_API_APPLEHTTP_PROTO cruft

Conflicts:
	libavformat/allformats.c
	libavformat/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-03-13 12:21:43 +01:00
Paul B Mahol
ac45921a6b lavc: remove disabled 8SVX_RAW cruft 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-03-13 11:17:09 +00:00
Michael Niedermayer
ed80427e0e Merge commit '0a7c4daf469d4ac447fb822fe78337f62f4c04e6' 
* commit '0a7c4daf469d4ac447fb822fe78337f62f4c04e6':
  lavf: remove disabled FF_API_CLOSE_INPUT_FILE cruft

Conflicts:
	libavformat/version.h

removial postponed as the wraper code is trivial

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-03-13 12:18:06 +01:00
Michael Niedermayer
b13cd2d867 Merge commit 'd6ed604cf4ca86ed345125b26eb5bdeea6d6bf68' 
* commit 'd6ed604cf4ca86ed345125b26eb5bdeea6d6bf68':
  lavc: remove disabled FF_API_IDCT cruft

Conflicts:
	libavcodec/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-03-13 12:03:22 +01:00
Michael Niedermayer
feccf2f6b7 Merge commit '3bcdf8dcb9891ffe49b6398d0e2c02f1712d8f00' 
* commit '3bcdf8dcb9891ffe49b6398d0e2c02f1712d8f00':
  lavc: remove disabled FF_API_SNOW cruft

Conflicts:
	libavcodec/avcodec.h
	libavcodec/options_table.h
	libavcodec/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-03-13 11:53:57 +01:00
Paul B Mahol
b3b46cd74e bktr: add missing #include for av_gettime() 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-03-13 10:48:09 +00:00
Janne Grunau
91d4823f70 avpacket: copy side data type and size in av_dup_packet 2013-03-13 11:34:47 +01:00
Michael Niedermayer
5753e34906 Merge commit 'fcb07e8b332bbd6f9558bff98ff5102c5f2d8252' 
* commit 'fcb07e8b332bbd6f9558bff98ff5102c5f2d8252':
  lavc: remove disabled FF_API_MMI cruft

Conflicts:
	libavcodec/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-03-13 11:29:04 +01:00
Michael Niedermayer
a8c0777325 Revert "Merge commit '0517c9e098092709397cc522c59fa63c83cc81be'" bring the old audio resampling API back 
This reverts commit d3edc65dd1, reversing
changes made to 150de78d7c.

Conflicts:

	libavcodec/version.h

It seems there are several applications still using it

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-03-13 10:57:00 +01:00
Michael Niedermayer
bbaa4432e2 vc1dec: remove unused variables 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-03-13 10:51:53 +01:00
Philip Langdale
21dc9b194f CrystalHD: Port to ref-counted frame API. 
Signed-off-by: Philip Langdale <philipl@overt.org>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-03-13 10:42:34 +01:00
Loren Merritt
5b3c1aecb2 hqdn3d: Fix out of array read in LOWPASS 
CC:libav-stable@libav.org
Signed-off-by: Anton Khirnov <anton@khirnov.net>
 2013-03-13 09:14:59 +01:00
Michael Niedermayer
0fe4b48540 cabac: remove unused argument of ff_init_cabac_states() 
Signed-off-by: Anton Khirnov <anton@khirnov.net>
 2013-03-13 09:14:05 +01:00
Nicolas George
be40d6cc2b rawdec: fix a typo -- || instead of | 
Signed-off-by: Anton Khirnov <anton@khirnov.net>
 2013-03-13 09:13:54 +01:00
Clément Bœsch
19c41c6d8e opt: re-enable memleak fix for duplicated options. 
The memleak fix in a1bcc76e was causing problems when the original
string wasn't NULL or av_malloc'ed, thus was disabled. It seems the only
OPT_STRING occurence where it needed to be fixed is in ffserver. This
commit fixes that specific problem and so re-enable the original code.
 2013-03-13 07:25:16 +01:00
Michael Niedermayer
12fe78a77b vp56: remove unused variable 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-03-13 04:12:14 +01:00
Ronald S. Bultje
f536df99fe dsputil: remove hpel functions (moved to hpeldsp). 2013-03-13 04:11:41 +01:00
Ronald S. Bultje
94b77678dc Move alpha half-pel assembly from dsputil to hpeldsp. 2013-03-13 04:11:27 +01:00
Ronald S. Bultje
6802c70106 Move sparc/vis half-pel assembly from dsputil to hpeldsp. 2013-03-13 04:09:43 +01:00
Michael Niedermayer
a0565a2b65 Move sh4 half-pel assembly from dsputil to hpeldsp. 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-03-13 04:07:41 +01:00
Ronald S. Bultje
e9e608ad58 Move bfin half-pel assembly from dsputil to hpeldsp. 2013-03-13 04:06:10 +01:00
Ronald S. Bultje
de99545f46 Move arm half-pel assembly from dsputil to hpeldsp. 2013-03-13 04:04:13 +01:00
Ronald S. Bultje
89f16ded9b Move ppc half-pel assembly from dsputil to hpeldsp. 2013-03-13 04:02:30 +01:00
Ronald S. Bultje
3ced55d51c Move x86 half-pel assembly from dsputil to hpeldsp. 2013-03-13 03:59:23 +01:00
Ronald S. Bultje
e0a8f31591 mjpeg: use hpeldsp instead of dsputil for half-pel functions. 2013-03-13 03:59:10 +01:00
Ronald S. Bultje
b42d594c85 svq1enc: use hpeldsp instead of dsputil for half-pel functions. 2013-03-13 03:59:00 +01:00
Ronald S. Bultje
771ba8f206 snow: use hpeldsp instead of dsputil for half-pel functions. 2013-03-13 03:58:49 +01:00
Ronald S. Bultje
05dd583426 svq3: use hpeldsp instead of dsputil for half-pel functions. 2013-03-13 03:58:31 +01:00
Ronald S. Bultje
4ba5dbc0e4 mpegvideo: use hpeldsp instead of dsputil for half-pel functions. 
This also converts vc1, since that is mpegvideo-based.
 2013-03-13 03:58:00 +01:00
Ronald S. Bultje
4652389777 svq1: use hpeldsp instead of dsputil for half-pel functions. 
This makes svq1 independent of dsputil.
 2013-03-13 03:57:45 +01:00
Ronald S. Bultje
cc5d17e026 mimic: use hpeldsp instead of dsputil for half-pel functions. 2013-03-13 03:57:33 +01:00
Ronald S. Bultje
04a75bb74f interplayvideo: use hpeldsp instead of dsputil for half-pel functions. 
This makes interplayvideo independent of dsputil.
 2013-03-13 03:57:21 +01:00
Ronald S. Bultje
af1e3dfb9e bink: use hpeldsp instead of dsputil for half-pel functions. 2013-03-13 03:56:09 +01:00
Ronald S. Bultje
4b642ab19b indeo3: use hpeldsp instead of dsputil for half-pel functions. 
This makes indeo3 independent of dsputil.
 2013-03-13 03:56:09 +01:00
Ronald S. Bultje
704c9874a3 vp56: use hpeldsp instead of dsputil for half-pel functions. 
This makes vp5 and vp6 independent of dsputil.
 2013-03-13 03:56:07 +01:00
Ronald S. Bultje
d1293512cf vp3: use hpeldsp instead of dsputil for half-pel functions. 
This makes vp3 independent of dsputil.
 2013-03-13 03:55:33 +01:00
Ronald S. Bultje
9628e5a4ac hpeldsp: add half-pel functions (currently copies of dsputil). 2013-03-13 03:54:47 +01:00
Michael Niedermayer
1f27053b91 Merge commit 'de27d2b92fa97deb2856d18e9f5f19586ce45a0f' 
* commit 'de27d2b92fa97deb2856d18e9f5f19586ce45a0f':
  lavc: remove disabled FF_API_LIBMPEG2 cruft

Conflicts:
	libavcodec/avcodec.h
	libavcodec/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-03-13 02:56:33 +01:00
Michael Niedermayer
d3edc65dd1 Merge commit '0517c9e098092709397cc522c59fa63c83cc81be' 
* commit '0517c9e098092709397cc522c59fa63c83cc81be':
  lavc: remove disabled FF_API_AVCODEC_RESAMPLE cruft

Conflicts:
	libavcodec/Makefile
	libavcodec/avcodec.h
	libavcodec/resample.c
	libavcodec/resample2.c
	libavcodec/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-03-13 02:41:18 +01:00
Michael Niedermayer
150de78d7c Merge commit 'd6d369bf1370999896500ae7eb5b9447ab635a3d' 
* commit 'd6d369bf1370999896500ae7eb5b9447ab635a3d':
  atomic: prefer gcc builtins over win32 atomics, if available.
  avframe: copy reordered_opaque in copy_props

Conflicts:
	libavutil/frame.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-03-13 02:08:41 +01:00