ffmpeg/FFmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2024-09-20 05:16:38 +00:00
Code Issues Packages Projects Releases Wiki Activity
40,687 Commits 36 Branches 398 Tags 535 MiB
7e944159c6
Commit Graph

40687 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Michael Niedermayer
7e944159c6 Merge remote-tracking branch 'qatar/master' 
* qatar/master: (25 commits)
  vcr1: Add vcr1_ prefixes to all static functions with generic names.
  vcr1: Fix return type of common_init to match the function pointer signature.
  vcr1enc: Replace obsolete get_bit_count by put_bits_count/flush_put_bits.
  motion-test: remove disabled code
  gxfenc: remove disabled half-implemented MJPEG tag
  x86: use more standard construct for setting ASM functions in FFT code
  fate: westwood-aud: disable decoding
  fate: caf: disable decoding
  fate: film-cvid: drop pcm audio and rename test
  fate: d-cinema-demux: drop unnecessary flags
  fate: split off dpcm-interplay from interplay-mve tests
  fate: rename funcom-iss to adpcm-ima-iss
  fate: rename cryo-apc to adpcm-ima-apc
  fate: rename adpcm-psx-str-v3 to adpcm-xa
  fate: split off adpcm-ms-mono test from dxa-feeble
  fate: split off adpcm-ima-ws test from vqa-cc
  fate: add adpcm-ima-smjpeg test
  fate: split off adpcm-ima-amv from amv test
  fate: separate bmv audio and video tests
  fate: separate delphine-cin audio and video tests
  ...

Conflicts:
	doc/platform.texi
	libavcodec/vcr1.c
	tests/fate/audio.mak
	tests/fate/demux.mak
	tests/fate/video.mak
	tests/ref/fate/ea-mad-pcm-planar
	tests/ref/fate/interplay-mve-16bit
	tests/ref/fate/interplay-mve-8bit
	tests/ref/fate/mtv
	tests/ref/fate/qtrle-1bit
	tests/ref/fate/qtrle-2bit
	tests/ref/fate/truemotion1-15
	tests/ref/fate/truemotion1-24
	tests/ref/fate/vqa-cc

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2012-05-14 20:17:24 +02:00
Nicolas George
281bde2789 udp: check for HAVE_PTHREAD_CANCEL instead of HAVE_PTHREADS. 
Some environments, for example Android, pretend to have pthreads
but actually have only a partial implementation.
 2012-05-14 19:32:43 +02:00
Nicolas George
83f954e859 configure: check for pthread_cancel. 2012-05-14 19:32:43 +02:00
Clément Bœsch
b545b947dd ffprobe: replace fast_asprintf() with bprint utils. 
Also remove the unused print_fmt_opt() in the process.
 2012-05-14 19:11:39 +02:00
Clément Bœsch
9548deeea9 lavu/bprint: add av_bprint_reset(). 2012-05-14 19:11:39 +02:00
Nicolas George
7a44223319 lavfi: document filter design subtleties. 
The details on reference ownership and permissions are missing.
 2012-05-14 18:56:52 +02:00
Michael Niedermayer
381cc4b1e6 update_initial_durations: use av_ts2str() 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-05-14 17:51:05 +02:00
Michael Niedermayer
c69b6649cf update_initial_durations: add some checks to ensure things match up. 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-05-14 17:14:44 +02:00
Diego Biurrun
100c70b048 vcr1: Add vcr1_ prefixes to all static functions with generic names. 2012-05-14 16:19:16 +02:00
Diego Biurrun
a761e5951c vcr1: Fix return type of common_init to match the function pointer signature. 
libavcodec/vcr1.c:182: warning: initialization from incompatible pointer type
 2012-05-14 16:19:16 +02:00
Diego Biurrun
55da88c5ab vcr1enc: Replace obsolete get_bit_count by put_bits_count/flush_put_bits. 2012-05-14 16:19:14 +02:00
Diego Biurrun
5aad8e80a7 motion-test: remove disabled code 2012-05-14 15:38:43 +02:00
Diego Biurrun
70be4dddc8 gxfenc: remove disabled half-implemented MJPEG tag 2012-05-14 15:38:42 +02:00
Vitor Sessak
fcc456b829 x86: use more standard construct for setting ASM functions in FFT code 
Signed-off-by: Diego Biurrun <diego@biurrun.de>
 2012-05-14 15:38:42 +02:00
Michael Niedermayer
6d49e819be ffmpeg: revert 492cc1 
This restores correct block_align values in case of stream copy.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-05-14 15:15:11 +02:00
Michael Niedermayer
8443082db6 ogg: rewrite first timestamp reading code. 
this is simpler and closer to how timestamps are found for seeking.

Fixes Ticket1186

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-05-14 14:15:34 +02:00
Michael Niedermayer
5931c754b8 ogg: in ogg_get_length() start from data_offset not 0. 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-05-14 14:15:34 +02:00
Mans Rullgard
09a35f251a fate: westwood-aud: disable decoding 
The codec (adpcm-ima-ws) is tested elsewhere.  Using framecrc output
provides more information than a single md5 if something goes wrong.

Signed-off-by: Mans Rullgard <mans@mansr.com>
 2012-05-14 13:06:05 +01:00
Mans Rullgard
f70d91e268 fate: caf: disable decoding 
This is intended as a demuxer test and the file contains pcm_s16be
audio which is tested elsewhere.

Signed-off-by: Mans Rullgard <mans@mansr.com>
 2012-05-14 13:05:30 +01:00
Mans Rullgard
b809991a31 fate: film-cvid: drop pcm audio and rename test 
Signed-off-by: Mans Rullgard <mans@mansr.com>
 2012-05-14 13:05:07 +01:00
Mans Rullgard
0bbb330ee3 fate: d-cinema-demux: drop unnecessary flags 
Signed-off-by: Mans Rullgard <mans@mansr.com>
 2012-05-14 13:04:20 +01:00
Mans Rullgard
cd7b82c5d1 fate: split off dpcm-interplay from interplay-mve tests 
These two files use the same audio codec so only one test for
this is needed.

Signed-off-by: Mans Rullgard <mans@mansr.com>
 2012-05-14 13:02:02 +01:00
Mans Rullgard
838521e110 fate: rename funcom-iss to adpcm-ima-iss 
This matches the name of the codec.

Signed-off-by: Mans Rullgard <mans@mansr.com>
 2012-05-14 13:01:01 +01:00
Mans Rullgard
9656b7f2ae fate: rename cryo-apc to adpcm-ima-apc 
This matches the name of the tested codec.

Signed-off-by: Mans Rullgard <mans@mansr.com>
 2012-05-14 13:00:26 +01:00
Mans Rullgard
773459e757 fate: rename adpcm-psx-str-v3 to adpcm-xa 
This matches the name of the codec tested.

Signed-off-by: Mans Rullgard <mans@mansr.com>
 2012-05-14 12:56:06 +01:00
Mans Rullgard
6a64ff74fe fate: split off adpcm-ms-mono test from dxa-feeble 
Signed-off-by: Mans Rullgard <mans@mansr.com>
 2012-05-14 12:55:47 +01:00
Mans Rullgard
95939bf565 fate: split off adpcm-ima-ws test from vqa-cc 
Signed-off-by: Mans Rullgard <mans@mansr.com>
 2012-05-14 12:55:33 +01:00
Mans Rullgard
88ae6178b1 fate: add adpcm-ima-smjpeg test 
Signed-off-by: Mans Rullgard <mans@mansr.com>
 2012-05-14 12:54:34 +01:00
Mans Rullgard
cb0713fca2 fate: split off adpcm-ima-amv from amv test 
Signed-off-by: Mans Rullgard <mans@mansr.com>
 2012-05-14 12:53:46 +01:00
Mans Rullgard
35d88a86e3 fate: separate bmv audio and video tests 
Signed-off-by: Mans Rullgard <mans@mansr.com>
 2012-05-14 12:51:59 +01:00
Mans Rullgard
bd7ac952b1 fate: separate delphine-cin audio and video tests 
Signed-off-by: Mans Rullgard <mans@mansr.com>
 2012-05-14 12:51:31 +01:00
Mans Rullgard
f4d2b93be4 fate: truemotion1: disable audio 
These tests include adpcm-ima-dk3 audio which is tested elsewhere.

Signed-off-by: Mans Rullgard <mans@mansr.com>
 2012-05-14 12:51:19 +01:00
Mans Rullgard
63322d8c89 fate: qtrle: disable audio in all tests 
These files contain mace6 audio which is tested elsewhere.

Signed-off-by: Mans Rullgard <mans@mansr.com>
 2012-05-14 12:50:19 +01:00
Mans Rullgard
0c26380f4f fate: pcm-planar: disable video 
This file has eamad video which is tested elsewhere.
Also rename the test to reflect this change.

Signed-off-by: Mans Rullgard <mans@mansr.com>
 2012-05-14 12:50:01 +01:00
Mans Rullgard
1c0e8b94ad fate: mtv: disable video decoding 
This test contains raw rgb565le video.  Converting to rgb24 serves
no useful purpose here.

Signed-off-by: Mans Rullgard <mans@mansr.com>
 2012-05-14 12:49:42 +01:00
Diego Biurrun
d19f3e9a2a doc: misc improvements for the Windows section 
Fix some orthography, wording and grammar issues; update the SDL section
with more current instructions; simplify lib.exe example command line;
drop outdated comments about libnut.
 2012-05-14 13:05:39 +02:00
Stefano Sabatini
e73241ba89 doc/ffprobe: fix rendering of the timecode chapter in the man page 2012-05-14 12:59:51 +02:00
Stefano Sabatini
3946187d60 ffprobe: add "nokey" option to default writer 
Help simplifying parsing in certain cases.
 2012-05-14 12:59:51 +02:00
Stefano Sabatini
f48f03a400 ffprobe: add "noprint_wrappers" option to default writer 
The option is useful for simplifying parsing.

Also use the new option in fate, in order to fix the regression
introduced by the previous commit.
 2012-05-14 12:59:51 +02:00
Stefano Sabatini
6cd06bd22c ffprobe: simplify/fix logic for the -show_format_entry option 
Do not skip chapter header/footer printing, which breaks the parsing for
most writers.
 2012-05-14 12:59:51 +02:00
Stefano Sabatini
a0fd322195 ffprobe: remove unused print_format_entry() function 
The function was introduced in 653d117c, but is not required.
 2012-05-14 12:59:51 +02:00
Michael Niedermayer
4991cbafaf mpegvideo_enc: Fix chroma edge size 
Fixes ticket1303

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-05-14 11:26:44 +02:00
Michael Niedermayer
04064e1c20 mpegts: fix handling of files smaller than 8kb 
Fixes Ticket1094

Analyzed-by: mjs973
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-05-14 02:41:36 +02:00
Michael Niedermayer
0db047cd0f Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  doc: fix link to fate.libav.org

Conflicts:
	doc/fate.texi

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2012-05-14 01:53:11 +02:00
Michael Niedermayer
555e2921dd flac_parser: speedup fifo realloc 
Fixes Ticket1121

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-05-14 01:42:51 +02:00
Clément Bœsch
5edd4fce40 lavf/utils: make use of av_ts2str() to print timestamps. 2012-05-13 22:38:31 +02:00
Michael Niedermayer
a927641e7a libswresample-simd: Add ff_pack_6ch_float_to_int32_a_avx and ff_pack_6ch_float_to_int32_a_sse4 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-05-13 20:56:18 +02:00
Michael Niedermayer
ca986a06ad libswresample-simd: add ff_pack_6ch_int32_to_float_a_avx and ff_pack_6ch_int32_to_float_a_sse4 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-05-13 20:53:30 +02:00
Michael Niedermayer
c4047ad9e0 libswresample: make NOP_N macro less picky on its parameters 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-05-13 20:45:32 +02:00
Michael Niedermayer
57bc91c710 libswresample: Change FLOAT_TO_INT32_N to need 1 register less 
same speed on sandy bridge

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-05-13 20:44:08 +02:00