virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-02 03:06:28 +02:00
Code Issues Releases Activity
50,083 Commits 37 Branches 400 Tags 460 MiB
e39821a65e
Commit Graph

50083 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Michael Niedermayer
e39821a65e nutenc: only write an index if there are syncpoints 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-02-18 20:51:54 +01:00
Michael Niedermayer
6cd650dbd2 ff_gen_search: Fix finding the maximum timestamp in a really small file 
Fixes Assertion failure

Found-by: durandal_1707
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-02-18 20:37:17 +01:00
Michael Niedermayer
695a766bff ff_read_timestamp: check stream_index before using it as array index 
Fixes out of array read

Found-by: durandal_1707
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-02-18 20:37:17 +01:00
Paul B Mahol
85921499c7 cdgraphics: set palette to zero too 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-02-18 16:38:06 +00:00
Paul B Mahol
1f4ab61b74 lavc/cdxl: clear palette before reading it 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-02-18 16:19:27 +00:00
Ronald S. Bultje
71ae8d50b2 x86/dsputil: fix compilation when h263 decoder/encoder are disabled. 
The symbol "ff_h263_loop_filter_strength" is defined in h263.c, but
the h263 loopfilter functions (in the .asm file) are not optimized
out (even though their function pointers are never assigned).

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-02-18 15:18:56 +01:00
Ronald S. Bultje
51513b98d6 h264/svq3: stop using draw_edges. 
Instead, only extend edges on-demand when the motion vector actually
crosses the visible decoded area using ff_emulated_edge_mc(). This
changes decoding time for cathedral from 8.722sec to 8.706sec, i.e.
0.2% faster overall. More generally (VP8 uses this also), low-motion
content gets significant speed improvements, whereas high-motion content
tends to decode in approximately the same time.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-02-18 15:18:56 +01:00
Clément Bœsch
f894246304 lavf/showspectrum: add divVerent in the (c) for his recent work on the filter. 2013-02-18 13:34:37 +01:00
Michael Niedermayer
0789374ed3 Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  svq3: unbreak decoding

No change to the code as this fix was already part of FFmpeg

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-02-18 13:03:38 +01:00
Michael Niedermayer
82e82fa2e5 Merge commit 'aa11cb79318baa3415d553424ba378f6c62e1f9b' 
* commit 'aa11cb79318baa3415d553424ba378f6c62e1f9b':
  build: make audio_frame_queue a stand-alone component

Conflicts:
	configure
	libavcodec/Makefile

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-02-18 12:55:31 +01:00
Michael Niedermayer
4b7c81c3e0 Merge commit '870a0c669e536d56c6325d84f65e34c53792398e' 
* commit '870a0c669e536d56c6325d84f65e34c53792398e':
  build: The libopencore-amrnb encoder depends on audio_frame_queue

Conflicts:
	libavcodec/Makefile

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-02-18 12:29:31 +01:00
Michael Niedermayer
2220f13d82 Merge commit '8837f4396a1a458a0efb07fe7daba7b847755a7a' 
* commit '8837f4396a1a458a0efb07fe7daba7b847755a7a':
  libopencore-amrwb: Make AMR-WB ifdeffery more precise

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-02-18 12:20:16 +01:00
Michael Niedermayer
ab213b5360 Merge commit 'e6bda9a9fd86505927a2e095e495eae104860701' 
* commit 'e6bda9a9fd86505927a2e095e495eae104860701':
  libopencore-amr: Conditionally compile decoder and encoder bits

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-02-18 12:15:12 +01:00
Michael Niedermayer
4ff0e63a01 Merge commit '56632fef65c0cb6946ed3648ded3d7b82e5c5c17' 
* commit '56632fef65c0cb6946ed3648ded3d7b82e5c5c17':
  libopencore-amrnb: cosmetics: Group all encoder-related code together

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-02-18 12:10:57 +01:00
Michael Niedermayer
f88f7b86a9 Merge commit '0b70fb1d518cbd796545fd6eef02772cd0d892c7' 
* commit '0b70fb1d518cbd796545fd6eef02772cd0d892c7':
  dsputil: convert remaining op_pixels_func

No changes to the code as all these fixes already existed in FFmpeg.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-02-18 12:03:55 +01:00
Michael Niedermayer
96008082db Merge commit '488f87be873506abb01d67708a67c10a4dd29283' 
* commit '488f87be873506abb01d67708a67c10a4dd29283':
  roqvideodec: check dimensions validity
  vqavideo: check chunk sizes before reading chunks
  qdm2: check array index before use, fix out of array accesses

Conflicts:
	libavcodec/qdm2.c
	libavcodec/roqvideodec.c
	libavcodec/vqavideo.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-02-18 11:26:53 +01:00
Matti Hamalainen
7f3624dc81 svq3: unbreak decoding 
a7d2861d36 removed necessary braces.
 2013-02-18 02:55:07 +01:00
Ronald S. Bultje
c63f9fb37a h264: don't store intra pcm samples in h->mb. 
Instead, keep them in the bitstream buffer until we read them verbatim,
this saves a memcpy() and a subsequent clearing of the target buffer.
decode_cabac+decode_mb for a sample file (CAPM3_Sony_D.jsv) goes from
6121.4 to 6095.5 cycles, i.e. 26 cycles faster.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-02-18 01:21:23 +01:00
Michael Niedermayer
54b2bddd22 v4l2: try to fix build on BSD 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-02-18 00:53:17 +01:00
Paul B Mahol
f4e29c408c lavfi/noise: switch to AVLFG noise generator 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-02-17 21:45:21 +00:00
Carl Eugen Hoyos
259603b917 h264: don't initialize missing pictures when using VDPAU. 
This fixes an assertion failure when running mplayer -vc ffh264vdpau.

Reported by irc user ioni.
 2013-02-17 22:33:40 +01:00
Michael Niedermayer
dece584a63 h264: avoid calling get_format() multiple times 
Some applications do not like that.
Fixes VDA
Reduces noise for VDPAU

Tested-by: Guillaume POIRIER <poirierg@gmail.com>
Tested-by: Carl Eugen Hoyos <cehoyos@ag.or.at>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-02-17 22:26:33 +01:00
Luca Barbato
aa11cb7931 build: make audio_frame_queue a stand-alone component 
Encoders requiring it have the dependency expressed in the
configure.
 2013-02-17 22:05:18 +01:00
Carl Eugen Hoyos
8d0757e107 Revert "swfenc: use av_get_audio_frame_duration() instead of AVCodecContext.frame_size" 
This reverts commit 620b88a302.

Fixes ticket #2272.

Conflicts:
	libavformat/swfenc.c
 2013-02-17 19:56:09 +01:00
Carl Eugen Hoyos
fdbe7628a9 Add yvu410 as a supported v4l2 input format. 2013-02-17 19:45:58 +01:00
Carl Eugen Hoyos
fdec49cbe8 Add gray16 as a supported v4l2 input format. 2013-02-17 19:44:13 +01:00
Michael Niedermayer
29c8619a49 fate: add print() to the tests of eval 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-02-17 17:36:27 +01:00
Michael Niedermayer
09ece9fa6c eval: print() support 
This allows printing values via av_log from expressions.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-02-17 17:36:27 +01:00
Carl Eugen Hoyos
cf36180143 Only set accelerated arm fft functions if fft is enabled. 
Fixes lavc compilation (linking) for configurations without fft.

Reported-by: tyler wear
Tested-by: Gavin Kinsey
 2013-02-17 17:29:55 +01:00
Clément Bœsch
1e860f1668 doc/codecs: simple sub_charenc option documentation. 2013-02-17 16:58:19 +01:00
Nicolas George
dcc73aaaa9 doc/examples: do not allocate AVFrame directly. 
The size of the AVFrame structure is not part of the ABI;
it can grow with later versions. Therefore, applications
are not supposed to allocate AVFrame directly, they are
supposed to use avcodec_alloc_frame() instead.
 2013-02-17 15:51:50 +01:00
Michael Niedermayer
59e46ef63a Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  error_resilience: add required headers.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-02-17 14:24:09 +01:00
Clément Bœsch
f3147917bf lavf/subtitles: error out in case of bitmap subtitles. 2013-02-17 13:35:35 +01:00
Clément Bœsch
fe150a48a7 lavc: fix codec_descriptor and pkt_timebase doxy. 2013-02-17 13:35:32 +01:00
Stefano Sabatini
894ed8fbb7 tests: fix values for the unsharp test 
Set odd size for unsharp matrices, even values are not accepted.
 2013-02-17 13:29:46 +01:00
Clément Bœsch
b1e6b144ed lavc/utils: reindent in avcodec_decode_subtitle2() after f7963993. 2013-02-17 13:08:30 +01:00
Clément Bœsch
90fb3e9bee lavfi/subtitles: set a different description between ass and subtitles. 2013-02-17 12:58:20 +01:00
Clément Bœsch
2a14b23484 lavfi: rename vf_ass.c to vf_subtitles.c 2013-02-17 12:58:20 +01:00
Clément Bœsch
08d149d688 lavfi/subtitles: support charenc option. 2013-02-17 12:58:20 +01:00
Clément Bœsch
3a0a959dcb lavfi/subtitles: split options between ass and subtitles. 2013-02-17 12:58:20 +01:00
Clément Bœsch
f796399344 lavc: support subtitles character encoding conversion. 2013-02-17 12:57:56 +01:00
Diego Biurrun
870a0c669e build: The libopencore-amrnb encoder depends on audio_frame_queue 
CC: libav-stable@libav.org
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
 2013-02-17 12:03:25 +01:00
Diego Biurrun
8837f4396a libopencore-amrwb: Make AMR-WB ifdeffery more precise 
The library might provide an encoder in the future, so it's better to
check for the presence of the decoder rather than just the library.

CC: libav-stable@libav.org
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
 2013-02-17 12:03:25 +01:00
Diego Biurrun
e6bda9a9fd libopencore-amr: Conditionally compile decoder and encoder bits 
CC: libav-stable@libav.org
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
 2013-02-17 12:03:25 +01:00
Diego Biurrun
56632fef65 libopencore-amrnb: cosmetics: Group all encoder-related code together 
CC: libav-stable@libav.org
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
 2013-02-17 12:03:24 +01:00
Luca Barbato
0b70fb1d51 dsputil: convert remaining op_pixels_func 
Convert to diffptr_t the line_size parameters still int.

Remove all the warnings in dsputil.c
 2013-02-17 12:03:24 +01:00
Clément Bœsch
8732271e40 lavc: mark bitmap based subtitles codecs as such. 2013-02-17 11:59:24 +01:00
Stefano Sabatini
7ca2f8b113 lavfi/mp: drop mp=kerndeint filter 
The filter has been natively integrated into libavfilter.
 2013-02-17 11:48:45 +01:00
Stefano Sabatini
8c85a9f046 lavfi/mp: drop mp=unsharp filter 
The native filter is equivalent from the point of view of the features
and of performances.
 2013-02-17 11:48:37 +01:00
Stefano Sabatini
89505f2c3f lavfi/unsharp: add missing NULL check 2013-02-17 11:48:31 +01:00