RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
55,944 Commits 37 Branches 400 Tags 270 MiB
Commit Graph

55944 Commits

Author SHA1 Message Date
Martin Storsjö 789cd1de99 pcm-dvd: Fix build on big endian 
Signed-off-by: Martin Storsjö <martin@martin.st>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-09-01 13:00:38 +02:00
Michael Niedermayer cb4d05e7f2 Merge commit 'a42e3a6700547e4e49445bda81d3a89ec3e081a9' 
* commit 'a42e3a6700547e4e49445bda81d3a89ec3e081a9':
  pcm_dvd: consolidate pieces from pcm.c and mpeg.c

Conflicts:
	libavcodec/pcm.c
	libavcodec/version.h
	libavformat/mpeg.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-09-01 13:00:08 +02:00
Michael Niedermayer d7f917c37a fate: update fate tests after master:291ad12ea2d1: ffprobe: show probe_score in the format section 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-09-01 12:53:24 +02:00
Stefano Sabatini 291ad12ea2 ffprobe: show probe_score in the format section 
Should address trac ticket #2621.
 2013-09-01 11:34:18 +02:00
Stefano Sabatini 51b01573e5 ffprobe: fix format section XML validation 
It was broken since 2186a7e547.
 2013-09-01 11:34:12 +02:00
Michael Niedermayer 93cf7b0195 avcodec/h264: set er.ref_count earlier 
Fixes Ticket2910

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-09-01 04:02:03 +02:00
Michael Niedermayer 990bbc15b8 avcodec/error_resilience: change out commented printf() to av_log() 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-09-01 03:50:08 +02:00
Michael Niedermayer 0388203098 avformat/utils: fix duration_fields calculation when need_parsing=0 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-09-01 00:46:14 +02:00
Michael Niedermayer 8349be852b avformat/lxfdec: use a parser to parse video frame headers 
lxf needs a parser (or would need to set a few fields explicitly).
Fixes Ticket2917

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-09-01 00:21:37 +02:00
Michael Niedermayer 8da23be458 avcodec/utils: avcodec_string: print colorspace type 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-08-31 17:22:04 +02:00
Michael Niedermayer ea07dbdeaa avcodec/utils: avcodec_string: Print color_range 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-08-31 17:21:20 +02:00
Michael Niedermayer 336982a0ce avcodec/utils: avcodec_string: make the colorspace printing code more extendible. 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-08-31 17:00:00 +02:00
Michael Niedermayer 4fa00c567c Merge remote-tracking branch 'cehoyos/master' 
* cehoyos/master:
  Fix make checkheaders for wavpackenc.h
  Fix make checkheaders for vdpau_internal.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-08-31 13:55:38 +02:00
Michael Niedermayer b043d80be4 Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  pcm_bluray: cosmetics

Conflicts:
	libavcodec/pcm-bluray.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-08-31 13:47:04 +02:00
Michael Niedermayer 4273236e2f Merge commit '0d6549d8b57aaa5be8efb794154cdbe9a645910f' 
* commit '0d6549d8b57aaa5be8efb794154cdbe9a645910f':
  pcm_bluray: rename pcm-mpeg.c to pcm-bluray.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-08-31 13:36:01 +02:00
Carl Eugen Hoyos b970f85564 Fix make checkheaders for wavpackenc.h 2013-08-31 13:34:46 +02:00
Carl Eugen Hoyos e7da19e9fa Fix make checkheaders for vdpau_internal.h 2013-08-31 13:32:13 +02:00
Christian Schmidt a42e3a6700 pcm_dvd: consolidate pieces from pcm.c and mpeg.c 
Remove the header decoding for PCM audio from mpeg.c and the
20/24bit parts from pcm.c and merge them into a new decoder in
pcm-dvd.c.

The decoder has added support for samples that span multiple
packets and modified 20/24bit group decoding. Both is needed to
decode samples that have been generated with DVD-Lab Pro 2. The
decoding of 16bit PCM and two channel 24bit is identical to
before. No other samples are known to verify the correctness of
the encoding this software does.
The complete list of tested formats is
48kHz/16bit/2-8 channels
48kHz/24bit/2-5 channels
96kHz/16bit/2-4 channels
96kHz/24bit/2 channels

Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
 2013-08-31 11:26:29 +02:00
Christian Schmidt 21fd2f84ce pcm_bluray: cosmetics 2013-08-31 11:00:46 +02:00
Christian Schmidt 0d6549d8b5 pcm_bluray: rename pcm-mpeg.c to pcm-bluray.c 
The original idea was to collect PCM codecs that could appear in various
MPEG streams in this file. Discussion in IRC lead to the conclusion that
one codec per file would be better and stop the need for #ifdefs.
 2013-08-31 11:00:46 +02:00
Michael Niedermayer 227a0eb5a9 avformat/avidec: match first index and first packet size=0 handling 
Fixes Ticket2861

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-08-31 03:08:25 +02:00
Michael Niedermayer 454a11a1c9 avcodec/dsputil: fix signedness in sizeof() comparissions 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-08-30 23:40:47 +02:00
Michael Niedermayer 86736f59d6 avcodec/pngdsp: fix (un)signed type in end comparission 
Fixes out of array accesses
Fixes Ticket2919

Found_by: ami_stuff
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-08-30 23:22:18 +02:00
Lukasz Marek 0b46d6f3ef lavu/bprint: add append buffer function 
Signed-off-by: Lukasz Marek <lukasz.m.luki@gmail.com>
Reveiwed-by: Nicolas George <nicolas.george@normalesup.org>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-08-30 22:36:38 +02:00
Michael Niedermayer 6e1b1a27a4 avcodec/avpacket: Use av_free_packet() in error cleanups 
This prevents memleaks on errors
reproduceable with fate when error pathes are forced

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-08-30 21:43:35 +02:00
Michael Niedermayer 5c504e4df7 vformat/subtitles: check av_copy_packets return code 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-08-30 21:36:58 +02:00
Paul B Mahol c042684476 kgv1dec: remove unused avctx from codec private context 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-08-30 18:24:19 +00:00
Paul B Mahol 057dce5f21 kgv1dec: make decoder independent of sizeof(AVFrame) 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-08-30 18:24:18 +00:00
Paul B Mahol ea3ce00859 wnv1: remove unused avctx from codec private context 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-08-30 18:24:18 +00:00
Michael Niedermayer 60fed98e63 avcodec/pngdec: fix last_row_size type 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-08-30 19:34:24 +02:00
Michael Niedermayer 7b47d7f75e avcodec/pngdec: Fix padded alloc code with threads 
Fixes Ticket2903
Fixes out of array write
no releases should be affected by this

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-08-30 19:34:23 +02:00
Thilo Borgmann d814a839ac Reinstate proper FFmpeg license for all files. 2013-08-30 15:47:38 +00:00
Carl Eugen Hoyos 8fe1fb41ac Fix compilation with --disable-mmx. 2013-08-30 15:21:15 +02:00
Paul B Mahol 48cd1037f6 cmdutils: silence warning about incompatible pointer types 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-08-30 12:41:36 +00:00
Michael Niedermayer 4f5454d201 avcodec/mpegvideo: reduce log level for messages about allocating frames. 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-08-30 14:20:59 +02:00
Michael Niedermayer b05cd1ea7e ffv1dec: Check bits_per_raw_sample and colorspace for equality in ver 0/1 headers 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-08-30 13:53:58 +02:00
Michael Niedermayer 05507348af Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  ppc: don't return a value from a function declared void

See: 01a82f1dc5

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-08-30 12:58:24 +02:00
Michael Niedermayer 62a6052974 Merge commit 'e998b56362c711701b3daa34e7b956e7126336f4' 
* commit 'e998b56362c711701b3daa34e7b956e7126336f4':
  x86: avcodec: Consistently structure CPU extension initialization

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-08-30 12:50:01 +02:00
Michael Niedermayer 7fb758cd8e avcodec/x86/lpc: Fix cpu flag checks so they work 
Broken by 6369ba3c9c

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-08-30 12:34:52 +02:00
Michael Niedermayer c1913064e3 avcodec/x86/vp8dsp: Fix cpu flag checks so they work 
Broken by 6369ba3c9c

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-08-30 12:33:56 +02:00
Michael Niedermayer 8be0e2bd43 Merge commit '6369ba3c9cc74becfaad2a8882dff3dd3e7ae3c0' 
* commit '6369ba3c9cc74becfaad2a8882dff3dd3e7ae3c0':
  x86: avcodec: Use convenience macros to check for CPU flags

Conflicts:
	libavcodec/x86/dsputil_init.c
	libavcodec/x86/hpeldsp_init.c
	libavcodec/x86/motion_est.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-08-30 12:08:28 +02:00
Michael Niedermayer f0a3562382 Merge commit '79aec43ce813a3e270743ca64fa3f31fa43df80b' 
* commit '79aec43ce813a3e270743ca64fa3f31fa43df80b':
  x86: Add and use more convenience macros to check CPU extension availability

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-08-30 11:57:35 +02:00
Sean McGovern 01a82f1dc5 ppc: don't return a value from a function declared void 
Signed-off-by: Martin Storsjö <martin@martin.st>
 2013-08-30 11:56:11 +02:00
Michael Niedermayer 09c94b57ca Merge commit 'a6b650118543e1580e872896d8976042b7c32d01' 
* commit 'a6b650118543e1580e872896d8976042b7c32d01':
  ppc: cosmetics: Consistently format CPU flag detection invocations

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-08-30 11:48:54 +02:00
Timothy Gu e45e72f5f8 doc/encoders: reformat and add some clarification in libtwolame doc 
Signed-off-by: Timothy Gu <timothygu99@gmail.com>
Signed-off-by: Stefano Sabatini <stefasab@gmail.com>
 2013-08-30 11:37:07 +02:00
Timothy Gu 40b8350b57 doc/encoders: reformat libmp3lame doc 
Signed-off-by: Timothy Gu <timothygu99@gmail.com>
Signed-off-by: Stefano Sabatini <stefasab@gmail.com>
 2013-08-30 11:36:35 +02:00
Michael Niedermayer 547d690d67 ffv1dec: check that global parameters dont change in version 0/1 
Such changes are not allowed nor supported

Fixes Ticket2906

Found-by: ami_stuff
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-08-30 05:27:51 +02:00
Michael Niedermayer 20b965a1a4 avcodec/ffv1dec: check global header version 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-08-30 03:43:49 +02:00
Michael Niedermayer 259292f9d4 avcodec/mpegvideo: Dont incorrectly warn about missing keyframes 
Files starting with B frames in presentation order generated the
"no keyframe" warning before this change.

Based on patch by: Robert Krüger <krueger@lesspain.de>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-08-30 01:45:11 +02:00
Sean McGovern f1f728cbe4 ppc: don't return a value from a function declared void 
Signed-off-by: Martin Storsjö <martin@martin.st>
 2013-08-30 00:41:10 +03:00