generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
52,559 Commits 24 Branches 241 Tags 173 MiB
9a0e40ec8c
Commit Graph

52559 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Michael Niedermayer
e07e8882ae Merge commit 'a77aed142cade3beb0cd43f879d4f47daae23b8a' 
* commit 'a77aed142cade3beb0cd43f879d4f47daae23b8a':
  fate: Rename video filters file and add separate video filters target

Conflicts:
	tests/fate/filter-video.mak

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-04-19 23:26:55 +02:00
Michael Niedermayer
6c5989cce9 Merge commit 'b357f1d1d3dd1d6672df6a397a31be425d31b6d1' 
* commit 'b357f1d1d3dd1d6672df6a397a31be425d31b6d1':
  fate: Split audio filters into their own separate file

Conflicts:
	tests/Makefile
	tests/fate/filter.mak

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-04-19 23:13:20 +02:00
Michael Niedermayer
4cb59ad84b Merge commit '3eec1d41b4a947ba497f528e68da14a8befb85b9' 
* commit '3eec1d41b4a947ba497f528e68da14a8befb85b9':
  fate: Reuse VREF and AREF variables where appropriate

Conflicts:
	tests/fate/filter.mak
	tests/fate/video.mak

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-04-19 22:55:21 +02:00
Michael Niedermayer
f4b05cd841 Merge commit '5e83d9aced2fc2b2e1360452794c58aba55d497c' 
* commit '5e83d9aced2fc2b2e1360452794c58aba55d497c':
  h264: fully support cropping.

Conflicts:
	doc/APIchanges
	libavcodec/h264.c
	libavcodec/h264_ps.c
	libavcodec/options_table.h
	libavcodec/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-04-19 22:46:51 +02:00
Martin Storsjö
287c8db39e cosmetics: bfin: Fix indentation in the dsputil init function 
Signed-off-by: Martin Storsjö <martin@martin.st>
 2013-04-19 23:29:22 +03:00
Ronald S. Bultje
d4d186d185 dsputil: Remove non-8bpp draw_edge 
It is never used.

Signed-off-by: Martin Storsjö <martin@martin.st>
 2013-04-19 23:29:22 +03:00
Ronald S. Bultje
c9f5fcd08c dsputil: Merge 9-10 bpp functions for get_pixels and draw_edge 
These only care about pixel storage unit size, not actual bits
used (i.e. they don't clip).

Signed-off-by: Martin Storsjö <martin@martin.st>
 2013-04-19 23:29:22 +03:00
Ronald S. Bultje
619e0da191 dsputil: Remove unused 32-bit functions 
Previously, if dct_bits was set to 32, we used separate 32-bit
versions of these functions. Since dct_bits now is removed,
remove the unused 32-bit versions of the functions.

Signed-off-by: Martin Storsjö <martin@martin.st>
 2013-04-19 23:29:22 +03:00
Ronald S. Bultje
c443117f25 dsputil: Remove dct_bits 
dct_bits is never set except in h264, where it is never used,
thus remove it.

Signed-off-by: Martin Storsjö <martin@martin.st>
 2013-04-19 23:29:22 +03:00
Ronald S. Bultje
54cd5e4f92 dsputil: Remove hpel functions (moved to hpeldsp) 
Signed-off-by: Martin Storsjö <martin@martin.st>
 2013-04-19 23:29:22 +03:00
Ronald S. Bultje
2957d29f05 alpha: hpeldsp: Move half-pel assembly from dsputil to hpeldsp 
Signed-off-by: Martin Storsjö <martin@martin.st>
 2013-04-19 23:29:22 +03:00
Ronald S. Bultje
78ce568e43 sparc: hpeldsp: Move vis half-pel assembly from dsputil to hpeldsp 
Signed-off-by: Martin Storsjö <martin@martin.st>
 2013-04-19 23:29:22 +03:00
Michael Niedermayer
278bd2054c sh4: hpeldsp: Move half-pel assembly from dsputil to hpeldsp 
Signed-off-by: Martin Storsjö <martin@martin.st>
 2013-04-19 23:29:21 +03:00
Ronald S. Bultje
bfb41b5039 bfin: hpeldsp: Move half-pel assembly from dsputil to hpeldsp 
Signed-off-by: Martin Storsjö <martin@martin.st>
 2013-04-19 23:19:13 +03:00
Ronald S. Bultje
7384b7a713 arm: hpeldsp: Move half-pel assembly from dsputil to hpeldsp 
Signed-off-by: Martin Storsjö <martin@martin.st>
 2013-04-19 23:19:08 +03:00
Ronald S. Bultje
47e5a98174 ppc: hpeldsp: Move half-pel assembly from dsputil to hpeldsp 
Signed-off-by: Martin Storsjö <martin@martin.st>
 2013-04-19 23:18:59 +03:00
Ronald S. Bultje
8db00081a3 x86: hpeldsp: Move half-pel assembly from dsputil to hpeldsp 
Signed-off-by: Martin Storsjö <martin@martin.st>
 2013-04-19 23:18:53 +03:00
Ronald S. Bultje
28bc406c84 mjpeg: Use hpeldsp instead of dsputil for half-pel functions 
Signed-off-by: Martin Storsjö <martin@martin.st>
 2013-04-19 23:18:38 +03:00
Ronald S. Bultje
1277dc07fb svq1enc: Use hpeldsp instead of dsputil for half-pel functions 
Signed-off-by: Martin Storsjö <martin@martin.st>
 2013-04-19 23:18:32 +03:00
Ronald S. Bultje
2f6bc5f7c1 svq3: Use hpeldsp instead of dsputil for half-pel functions 
Signed-off-by: Martin Storsjö <martin@martin.st>
 2013-04-19 23:18:27 +03:00
Ronald S. Bultje
f4fed5a2f9 mpegvideo: Use hpeldsp instead of dsputil for half-pel functions 
This also converts vc1, since that is mpegvideo-based.

Signed-off-by: Martin Storsjö <martin@martin.st>
 2013-04-19 23:18:21 +03:00
Ronald S. Bultje
6caa44aa7d svq1: Use hpeldsp instead of dsputil for half-pel functions 
This makes svq1 independent of dsputil.

Signed-off-by: Martin Storsjö <martin@martin.st>
 2013-04-19 23:18:14 +03:00
Ronald S. Bultje
c10470035e mimic: Use hpeldsp instead of dsputil for half-pel functions 
Signed-off-by: Martin Storsjö <martin@martin.st>
 2013-04-19 23:18:08 +03:00
Ronald S. Bultje
8071264f21 interplayvideo: Use hpeldsp instead of dsputil for half-pel functions 
This makes interplayvideo independent of dsputil.

Signed-off-by: Martin Storsjö <martin@martin.st>
 2013-04-19 23:18:02 +03:00
Ronald S. Bultje
0f0a11d576 bink: Use hpeldsp instead of dsputil for half-pel functions 
Signed-off-by: Martin Storsjö <martin@martin.st>
 2013-04-19 23:17:56 +03:00
Ronald S. Bultje
8f992dc8c7 indeo3: Use hpeldsp instead of dsputil for half-pel functions 
This makes the Indeo 3 decoder independent of dsputil.

Signed-off-by: Martin Storsjö <martin@martin.st>
 2013-04-19 23:17:50 +03:00
Ronald S. Bultje
cb7ecb7563 vp56: Use hpeldsp instead of dsputil for half-pel functions 
This makes vp5 and vp6 independent of dsputil.

Signed-off-by: Martin Storsjö <martin@martin.st>
 2013-04-19 23:17:33 +03:00
Ronald S. Bultje
3bd062bf7f vp3: Use hpeldsp instead of dsputil for half-pel functions 
This makes vp3 independent of dsputil.

Signed-off-by: Martin Storsjö <martin@martin.st>
 2013-04-19 23:17:26 +03:00
Ronald S. Bultje
68d8238cca hpeldsp: Add half-pel functions (currently copies of dsputil) 
Signed-off-by: Martin Storsjö <martin@martin.st>
 2013-04-19 23:17:17 +03:00
Michael Niedermayer
05b2c998c7 avcodec: Fix lowres handling in buffer allocation 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-04-19 21:49:36 +02:00
Michael Niedermayer
a8b05dde0d Merge commit 'a7f46586bf47174b5fa00a905b767b1781ec8b72' 
* commit 'a7f46586bf47174b5fa00a905b767b1781ec8b72':
  ff_get_buffer(): allocate the frame for max(coded,display) dimensions

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-04-19 21:49:29 +02:00
Michael Niedermayer
194d0399a2 Merge commit '505642f18276aed03278ac91b1f334ea888eac6a' 
* commit '505642f18276aed03278ac91b1f334ea888eac6a':
  mp3dec: fallback to generic seeking when a TOC is not present

Conflicts:
	libavformat/mp3dec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-04-19 21:36:23 +02:00
Diego Biurrun
bc7fbd36ea fate: cosmetics: More sensible order for entries in video filter file 2013-04-19 18:07:48 +02:00
Diego Biurrun
a77aed142c fate: Rename video filters file and add separate video filters target 2013-04-19 18:07:48 +02:00
Diego Biurrun
b357f1d1d3 fate: Split audio filters into their own separate file 2013-04-19 18:07:48 +02:00
Diego Biurrun
3eec1d41b4 fate: Reuse VREF and AREF variables where appropriate 2013-04-19 18:07:48 +02:00
Michael Niedermayer
833bc6678f avformat: change seeking index consistency asserts to av_asserts 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-04-19 17:44:07 +02:00
Michael Niedermayer
42bcc4082d avcodec/mpegvideo_motion: Use a field from the current frame if the last is unavailable in DMV & 16x8 
Fixes null pointer dereference

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-04-19 14:48:01 +02:00
Clément Bœsch
30e6a02c23 lavf/http: remove duplicated dec flag. 2013-04-19 14:44:58 +02:00
Christophe Gisquet
76c7277385 x86: sbrdsp: implement SSE2 hf_apply_noise 
233 to 105 cycles on Arrandale and Win64.
Replacing the multiplication by s_m[m] by a pand and a pxor with
appropriate vectors is slower. Unrolling is a 15 cycles win.
A SSE version was 4 cycles slower.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-04-19 13:19:45 +02:00
Clément Bœsch
380cfce2b2 lavc: add AV_CODEC_PROP_TEXT_SUB. 
CC are not marked. Also allow potential mixed types later.
 2013-04-19 13:15:54 +02:00
Clément Bœsch
6189ff3679 lavf/gif: avoid forward declaration. 2013-04-19 12:11:10 +02:00
Clément Bœsch
a7c5b7a676 lavf/gif: correct the delay after the first frame. 
To define accurately the delay between two frames, it is necessary to
have both available. Before this commit, the first frame had a delay of
0; while in practice the problem is not visible in most situation, it is
problematic with low frame rate and large scene change.

This commit notably fixes output generated with commands such as:

  ffmpeg -i big_buck_bunny_1080p_h264.mov
     -vf "select='gt(scene,0.4)',scale=320:-1,setpts=N/TB"
     -frames:v 5 -y out.gif

Also, to avoid odd loop delays, the N-1 delay is duplicated for the last
frame.
 2013-04-19 12:02:19 +02:00
Anton Khirnov
5e83d9aced h264: fully support cropping. 
Based on a patch by Vittorio Giovara <vittorio.giovara@gmail.com>

Fixes Bug 378.
 2013-04-19 09:28:08 +02:00
Anton Khirnov
a7f46586bf ff_get_buffer(): allocate the frame for max(coded,display) dimensions 
Needed e.g. for h264 cropping to work properly.
 2013-04-19 09:26:53 +02:00
Michael Niedermayer
505642f182 mp3dec: fallback to generic seeking when a TOC is not present 
Fixes seeking without a Xing/Info header.

CC: libav-stable@libav.org
Signed-off-by: Anton Khirnov <anton@khirnov.net>
 2013-04-19 09:26:34 +02:00
Paul B Mahol
b63f7b3ac7 lavfi/afade: use AV_OPT_TYPE_DURATION 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-04-19 00:56:55 +00:00
Clément Bœsch
7e57adb464 lavf/gif: fix timing. 
pkt->duration can not be used since the values are only based on frame
rate.
 2013-04-19 02:15:57 +02:00
Clément Bœsch
13478b270a gif: use only one graphic control extension block per image. 
The encoder now doesn't produce any extra graphic control extension
block anymore. Only the image is encoded, and the muxer writing
its own GCE containing notably the timing information now includes the
optional palette transmitted through packet side data.

This commit avoid setting clashes between the two GCE, and reduce the
size of the generated file with pal8 output.
 2013-04-19 02:10:59 +02:00
Clément Bœsch
7b80b3cef0 lavc/utils: merge side data after video encode. 
This allows encoders to communicate side data to the muxers.
 2013-04-19 02:10:12 +02:00