ffmpeg/FFmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2024-10-17 12:03:26 +00:00
Code Issues Packages Projects Releases Wiki Activity
47,082 Commits 37 Branches 400 Tags 505 MiB
bf2f93cdbf
Commit Graph

47082 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Michael Niedermayer
bf2f93cdbf Merge commit '28c8e288fa0342fdef532a7522a4707bebf831cc' 
* commit '28c8e288fa0342fdef532a7522a4707bebf831cc':
  x86: h264_chromamc: port to cpuflags
  yop: fix typo
  avconv: fix copying per-stream metadata.
  doc: avtools-common-opts: Fix terminology concerning metric prefixes
  configure: suncc: Add compiler arch support for Nehalem & Sandy Bridge
  riff: Make ff_riff_tags static and move under appropriate #ifdef

Conflicts:
	libavformat/riff.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2012-11-26 00:43:45 +01:00
Stefano Sabatini
b473c9937e lavu/samplefmt: return the size of the allocated samples buffer at the next bump 
Make the functions av_samples_fill_arrays, av_samples_alloc, and
avcodec_fill_audio_frame return a buffer size rather than 0 in case of
success. This will be enabled at the next libavutil major bump, in order
to preserve backward compatibility.

Returning the size allows to simplify the code, avoiding a few function
calls.
 2012-11-25 23:23:24 +01:00
Ivan Pozdeev
329b8f85b0 doc/encoders: add a note for x264 options that use colon 
Signed-off-by: Ivan Pozdeev <ivan_pozdeev@mail.ru>
Signed-off-by: Stefano Sabatini <stefasab@gmail.com>
 2012-11-25 23:17:26 +01:00
Carl Eugen Hoyos
d643dd5c55 Support switching field order when decoding frwu. 
The binary encoder has a "switch field order" setting that
moves one line from the top to the bottom of the frame.

Fixes ticket #966.
 2012-11-25 23:06:12 +01:00
Michael Niedermayer
b5b9686615 imc: flush decoder 
Fixes Ticket1899

Based on code by ami_stuff
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-11-25 22:48:18 +01:00
Michael Niedermayer
579d21f777 tga: check palette size earlier. 
Fixes Ticket1895

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-11-25 22:33:54 +01:00
Stefano Sabatini
e55c3857d2 lavc/utils: check return value of avcodec_fill_audio_frame() for < 0 
Assume that the value is always negative in case of error, as stated in
the docs, do not assume that the value cannot be != 0 in case of success.
 2012-11-25 20:34:01 +01:00
Stefano Sabatini
51e9f58e1c lavu/opt: add support for reading pixel and sample format through av_get_int() 
Simplify backward compatibility, when switching from AV_OPT_TYPE_INT to
AV_OPT_TYPE_SAMPLE/PIXEL_FMT.
 2012-11-25 20:31:39 +01:00
Stefano Sabatini
cf6c6134cd doc: add libswscale.texi and ffmpeg-scaler.texi files 2012-11-25 19:21:30 +01:00
Peter Ross
33181975b5 mpsmpeg4: use av_image_check_size 
Signed-off-by: Peter Ross <pross@xvid.org>
Reviewed-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-11-25 18:38:12 +01:00
Peter Ross
a246a603bf avrndec: use av_image_check_size 
Signed-off-by: Peter Ross <pross@xvid.org>
Reviewed-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-11-25 18:38:12 +01:00
Peter Ross
2d954ccd84 rawdec: use av_image_check_size 
Signed-off-by: Peter Ross <pross@xvid.org>
Reviewed-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-11-25 18:38:12 +01:00
Stefano Sabatini
252746d052 lavu/imgutils: add consistency checks to av_image_copy_plane() 
Add assertions and abort in case of invalid |dst_linesize| < bytewidth or
|src_linesize| < bytewidth.

Avoid to silently corrupt memory.
 2012-11-25 18:19:59 +01:00
Diego Biurrun
28c8e288fa x86: h264_chromamc: port to cpuflags 2012-11-25 17:25:10 +01:00
Paul B Mahol
b491da18d1 yop: fix typo 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Justin Ruggles <justin.ruggles@gmail.com>
 2012-11-25 11:10:52 -05:00
Anton Khirnov
4632abc7a3 avconv: fix copying per-stream metadata. 
It is handled separately from other types because it uses stream
specifiers and currently that triggers an assert in SET_DICT.

CC:libav-stable@libav.org
 2012-11-25 16:35:20 +01:00
Stefano Sabatini
26c531cc22 lavu/opt: fix range shown in set_format() log message 2012-11-25 15:50:46 +01:00
Stefano Sabatini
be2c0bc949 configure: prefer "resampling" in the libswresample pkg-config description 2012-11-25 15:01:33 +01:00
Stefano Sabatini
c70ec631c9 lavu/opt: add av_opt_ accessors for pixel/format/image size options 
The interface is implemented against the style of the other options
accessors. Possibly simplify programmatic setting of options.
 2012-11-25 15:01:33 +01:00
Peter Ross
fdd71cf04c iff decoder: initialise HAM line decoder with first palette entry 
The palette is organised into 'hold' and 'modify' pairs, hence why
the first palette entry is pal[1].

Fixes ticket #1701.

Signed-off-by: Peter Ross <pross@xvid.org>
Reviewed-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-11-25 14:40:36 +01:00
Michael Niedermayer
8f507feecb avfiltergraph: add AVOption table 
Reviewed-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-11-25 14:36:22 +01:00
Marcus Stollsteimer
2bf794b698 doc: avtools-common-opts: Fix terminology concerning metric prefixes 
'k', 'M', and 'G' are SI (unit) prefixes or metric prefixes,
not 'number postfixes'. Also, the statement regarding binary
prefixes ("powers of 2 are used instead of powers of 10")
might be misinterpreted (1 kB = 10^3 B, but 1 KiB != 2^3 B).

Signed-off-by: Diego Biurrun <diego@biurrun.de>
 2012-11-25 14:26:39 +01:00
Sean McGovern
f2ce813e37 configure: suncc: Add compiler arch support for Nehalem & Sandy Bridge 
GCC does not appear to have a -march= string for Westmere, which is a
bit surprising as it has a few more instructions than a Nehalem, but
a few less than a Sandy Bridge.

Signed-off-by: Diego Biurrun <diego@biurrun.de>
 2012-11-25 14:15:30 +01:00
Diego Biurrun
ddb009425c riff: Make ff_riff_tags static and move under appropriate #ifdef 
The table is not used outside the file.
 2012-11-25 13:32:10 +01:00
Michael Niedermayer
48cbdaea15 smacker: fix smacker_decode_header_tree() empty vlc table init 
Fixes Ticket1858

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-11-25 02:40:59 +01:00
Michael Niedermayer
e6305f7631 mov: set flags to indicate that byte wise seeking is not supported. 
Fixes Ticket1831

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-11-25 01:19:33 +01:00
Stefano Sabatini
e903cb4194 doc: add libswresample.texi and ffmpeg-resampler.texi files 2012-11-25 00:28:36 +01:00
Stefano Sabatini
f62abbf3b7 doc: move filters documentation to dedicated manual page ffmpeg-filters 2012-11-25 00:28:27 +01:00
Stefano Sabatini
fa4ead1d66 doc: move codec options and descriptions to a dedicated manual page 2012-11-25 00:27:07 +01:00
Nicolas George
ca4872e887 lavf/sbgdec: use proper constants for av_log(). 2012-11-24 23:56:52 +01:00
Carl Eugen Hoyos
d080292651 Support u8 in aiff. 
Fixes ticket #1960.
Reviewed-by; Paul B Mahol
 2012-11-24 21:21:50 +01:00
Michael Niedermayer
807fa714f0 adpcmdec: Fix OOM/infloop 
Found-by: ami_stuff
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-11-24 19:29:03 +01:00
Michael Niedermayer
34b6f1efa2 libopencore_amrwb: check packet size 
Fix OOM

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-11-24 18:26:54 +01:00
Michael Niedermayer
57c0da6fe4 smacker: sanity check audio size. 
Fixes, excessive memory allocation
Fixes Ticket1892

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-11-24 18:02:08 +01:00
Michael Niedermayer
014058abea af_aresample: check ff_get_audio_buffer() failure 
Fixes null pointer dereference

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-11-24 17:33:32 +01:00
Michael Niedermayer
ed017ab945 atrac1: Check block align. 
Fixes OOM
Fixes second samples posted in Ticket1893

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-11-24 16:38:22 +01:00
Michael Niedermayer
5c392bac9a ra288: Check block align. 
Fixes OOM
Fixes Ticket1893

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-11-24 16:38:22 +01:00
Carl Eugen Hoyos
387f50606c Fix type of default value for v210 decoder option -custom_stride. 
Reviewed-by: Paul B Mahol
 2012-11-24 16:09:07 +01:00
Piotr Bandurski
081bf60ec6 c93: signal EOF 2012-11-24 15:04:32 +00:00
Paul B Mahol
05b02e9c0f mmf: simplify code by using FFMIN 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2012-11-24 14:27:55 +00:00
Paul B Mahol
7f321fca23 mmf: signal EOF 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2012-11-24 14:24:13 +00:00
Paul B Mahol
9378a90add omadec: remove stale comment 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2012-11-24 11:41:43 +00:00
Paul B Mahol
4995145f40 codec_desc: mark PCM A-law/mu-law lossy 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2012-11-24 11:19:27 +00:00
Paul B Mahol
2d62732b21 codec_desc: provide aliases for PCM A-law/mu-law 
Inspired by d21b82fd3a.

Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2012-11-24 11:14:06 +00:00
Paul B Mahol
3d8e684f05 ADPCM IMA Dialogic decoder 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2012-11-24 10:56:47 +00:00
Paul B Mahol
ed591ed842 rl2: return meaningful error codes 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2012-11-24 10:28:23 +00:00
Paul B Mahol
1a61c7a54b wvenc: multichannel muxing 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2012-11-24 10:20:46 +00:00
Paul B Mahol
1b9467aea1 omaenc: remove superfluous "OMA: " 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2012-11-24 10:04:20 +00:00
Paul B Mahol
bc5ba1c7fd omaenc: abort for unsupported codecs 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2012-11-24 10:04:20 +00:00
Piotr Bandurski
6d6bf250dd riff: fix decoding of 24-bit packed int (type 1, 20-bit) 2012-11-24 10:54:38 +01:00