ffmpeg/FFmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2024-09-23 23:06:41 +00:00
Code Issues Packages Projects Releases Wiki Activity
56,225 Commits 36 Branches 398 Tags 538 MiB
83d2b7e9a2
Commit Graph

56225 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Michael Niedermayer
24b4e6c373 snow: Check av_frame_alloc() failures 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-08-29 23:23:22 +02:00
Michael Niedermayer
c4224fff1b avcodec/snow: gray support 
Fixes Ticket839

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-08-29 22:52:04 +02:00
Michael Niedermayer
ec120efaa9 doc/snow: add gray/alpha/gbr 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-08-29 22:52:04 +02:00
Michael Niedermayer
811d58e083 avcodec/utils: support non edge emu for grayscale 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-08-29 22:52:04 +02:00
Michael Niedermayer
cf06dee58d libavcodec/snow: change AVFrame to pointers to AVFrame for ABI stability 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-08-29 19:46:52 +02:00
Michael Niedermayer
1cefdc397e avcodec/snowenc: remove now unneeded include <assert.h> 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-08-29 17:08:56 +02:00
Michael Niedermayer
2bc8348c85 avcodec/snowenc: convert all asserts to av_asserts 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-08-29 17:08:56 +02:00
Michael Niedermayer
f07b569939 snowenc: remove disabled QUANTIZE2 code 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-08-29 17:08:56 +02:00
Michael Niedermayer
f896f92337 Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  cosmetics: Place arch initialization calls in alphabetical order

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-08-29 16:15:54 +02:00
Michael Niedermayer
e1c3e6277f Merge commit 'f0389eb777b1ab4291329d4f709098cdfa7384dc' 
* commit 'f0389eb777b1ab4291329d4f709098cdfa7384dc':
  arm: fmtconvert: Split armv6 fmtconvert code off from vfp code

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-08-29 16:10:39 +02:00
Michael Niedermayer
946f080b54 Merge commit '7ffda66fd5c81af4725bff7c2c4f207ba2aa0613' 
* commit '7ffda66fd5c81af4725bff7c2c4f207ba2aa0613':
  arm: float_dsp: Propagate cpu_flags to vfp initialization function

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-08-29 16:05:04 +02:00
Michael Niedermayer
99e7c702db Merge commit 'bd549cbaacd33dfb7be81d0619c9b107b8a85be7' 
* commit 'bd549cbaacd33dfb7be81d0619c9b107b8a85be7':
  arm: dcadsp: Move synth filter initialization to dcadsp file

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-08-29 16:00:45 +02:00
Michael Niedermayer
01cac26f68 Merge commit '1909f6b1b6da2db371c179bed5a19aaf979b7557' 
* commit '1909f6b1b6da2db371c179bed5a19aaf979b7557':
  swscale: cosmetics: Drop silly camelCase from swScale function pointer name

Conflicts:
	libswscale/swscale_unscaled.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-08-29 15:56:03 +02:00
Michael Niedermayer
c49b6c3d99 Merge commit '4e0799a4d04404abfa8fbc072640be76465158cf' 
* commit '4e0799a4d04404abfa8fbc072640be76465158cf':
  swscale: Add some missing av_cold to arch-specific init functions

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-08-29 15:48:53 +02:00
Michael Niedermayer
c5cec9a42b Merge commit '3aa682f25324d811ec284edc808eb71a46eae950' 
* commit '3aa682f25324d811ec284edc808eb71a46eae950':
  swscale: consistent names for arch-specific acceleration functions

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-08-29 15:41:05 +02:00
Michael Niedermayer
5ff1b588eb Merge commit 'c2503d9c8ab42ea55922e9f5a10c8bfbbbfeaf19' 
* commit 'c2503d9c8ab42ea55922e9f5a10c8bfbbbfeaf19':
  swscale: ppc: Hide arch-specific initialization details

Conflicts:
	libswscale/utils.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-08-29 15:10:09 +02:00
Michael Niedermayer
4399e72723 Merge commit '6af2c351b3ae61e4478950ffddd0dfcad06188b8' 
* commit '6af2c351b3ae61e4478950ffddd0dfcad06188b8':
  ppc: Add missing AltiVec cpuflag detection invocations

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-08-29 15:04:59 +02:00
Michael Niedermayer
3e75f98667 Merge commit 'de81b6ae4f38273ff27020f494cc46539110d34b' 
* commit 'de81b6ae4f38273ff27020f494cc46539110d34b':
  ppc: fdct: Remove vim editor settings comment

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-08-29 15:00:02 +02:00
Michael Niedermayer
8251529ff3 Merge commit '70dd8892bf00923af838756dfbb356a9b1e4e40d' 
* commit '70dd8892bf00923af838756dfbb356a9b1e4e40d':
  mpegvideo: Replace arch initialization ifdeffery by standard conditionals

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-08-29 14:53:44 +02:00