ffmpeg/FFmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2024-09-29 01:30:49 +00:00
Code Issues Packages Projects Releases Wiki Activity
47,116 Commits 37 Branches 398 Tags 500 MiB
8d231e37af
Commit Graph

47116 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Michael Niedermayer
8d231e37af af_aresample: consistently use ROUNDED_DIV 
This fixes issues with negative timestamps

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-11-26 21:09:15 +01:00
Michael Niedermayer
89d5262289 mpeg4videodec: use ROUNDED_DIV for pts calculation 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-11-26 21:08:57 +01:00
Paul B Mahol
67be7fb432 adpcm: thp, afc: support multichannel decoding 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2012-11-26 19:52:40 +00:00
Sergio Garcia Murillo
ec51b3308e h264: Fix minor bug in h264.c error trace 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-11-26 17:38:35 +01:00
Michael Niedermayer
4b5a12a2cb af_aresample: fix rounding of negative timestamps 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-11-26 16:25:47 +01:00
Michael Niedermayer
386fc67c79 Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  lavf: avoid integer overflow in ff_compute_frame_duration()

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2012-11-26 16:24:23 +01:00
Michael Niedermayer
a3f30f2e99 Merge commit '5ae72f54532960cb9eae82a1c9e8d505106c022b' 
* commit '5ae72f54532960cb9eae82a1c9e8d505106c022b':
  flashsv: check for keyframe before using differential coding
  h264: enable low delay only if no delayed frames were seen
  x86: fix build without inline asm

Conflicts:
	libavcodec/h264.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2012-11-26 16:11:02 +01:00
Michael Niedermayer
59b68ee887 Merge commit '3d3cf6745e2a5dc9c377244454c3186d75b177fa' 
* commit '3d3cf6745e2a5dc9c377244454c3186d75b177fa':
  aacdec: use float planar sample format for output

Conflicts:
	libavcodec/aacdec.c
	libavcodec/aacsbr.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2012-11-26 15:15:02 +01:00
Michael Niedermayer
a13148f633 Merge commit '8e134e5104e99a69cd4cea10540a7ce9c3682a2c' 
* commit '8e134e5104e99a69cd4cea10540a7ce9c3682a2c':
  lavc: clarify get_buffer() documentation
  mpegaudiodec: use planar sample format for output unless packed is requested
  x86: h264 qpel: use the correct number of utilized xmm regs in cglobal

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2012-11-26 14:24:19 +01:00
Michael Niedermayer
86270236d5 dsputil_mmx: ff_put_dirac_pixels depend now on yasm. 
Fix compile failure without yasm

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-11-26 13:59:41 +01:00
Peter Ross
76f60788e7 iff demuxer: don't bother checking bitmap compression type; iff decoder does this now 
Signed-off-by: Peter Ross <pross@xvid.org>
Reviewed-by: Paul B Mahol <onemda@gmail.com>
 2012-11-26 23:29:02 +11:00
Peter Ross
f737e76026 iff decoder: reindent 
Signed-off-by: Peter Ross <pross@xvid.org>
 2012-11-26 23:29:02 +11:00
Peter Ross
929a24efff iff decoder: merge iff ilbm and byterun1 decoders 
Signed-off-by: Peter Ross <pross@xvid.org>
Reviewed-by: Paul B Mahol <onemda@gmail.com>
 2012-11-26 23:29:02 +11:00
Peter Ross
f2dc82b90f dpx: perform width/height upgrade and av_image_check_size earlier to prevent segfault on malformed input 
Signed-off-by: Peter Ross <pross@xvid.org>
 2012-11-26 12:11:08 +00:00
Paul B Mahol
5a3370816f av_get_audio_frame_duration: add ADPCM_AFC 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2012-11-26 11:59:44 +00:00
Paul B Mahol
c5607dfddc doc/general: improve AST description 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2012-11-26 10:40:51 +00:00
Janne Grunau
7709ce029a lavf: avoid integer overflow in ff_compute_frame_duration() 
Scaling the denominator instead of the numerator if it is too large
loses precision. Fixes an assert caused by a negative frame duration in
the fuzzed sample nasa-8s2.ts_s202310.

CC: libav-stable@libav.org
 2012-11-26 10:26:08 +01:00
Janne Grunau
5ae72f5453 flashsv: check for keyframe before using differential coding 
Fixes a segfault in te fuzzed sample resolutionchange.flv_s211713.

CC: libav-stable@libav.org
 2012-11-26 10:26:01 +01:00
Janne Grunau
706acb558a h264: enable low delay only if no delayed frames were seen 
Dropping frames is undesirable but that is the only way by which the
decoder could return to low delay mode. Instead emit a warning and
continue with delayed frames.
Fixes a crash in fuzzed sample nasa-8s2.ts_s20033 caused by a larger
than expected has_b_frames value. Low delay keeps getting re-enabled
from a presumely broken SPS.

CC: libav-stable@libav.org
 2012-11-26 10:25:39 +01:00
Michael Niedermayer
b5e0e327ce ffmpeg: fix swr filter_type for auto inserted aresample filters 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-11-26 04:06:19 +01:00
Michael Niedermayer
4bd6d73fc8 ffmpeg: fix passing swresample options to the auto inserted swr 
Reviewed-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-11-26 03:51:29 +01:00
Michael Niedermayer
69d45d2ecb avfiltergraph: add aresample_swr_opts 
Reviewed-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-11-26 03:51:08 +01:00
Michael Niedermayer
2624027439 lavu: drop time redefinition as it causes some problems in some uncommon configurations. 
Based-on: e96d90eed6
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-11-26 02:23:30 +01:00
Michael Niedermayer
7b29b07394 Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  remove #defines to prevent use of discouraged external functions
  x86: h264: Convert 8-bit QPEL inline assembly to YASM

Conflicts:
	libavcodec/x86/dsputil_mmx.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2012-11-26 02:17:02 +01:00
Diego Biurrun
7ee4071362 x86: fix build without inline asm 
The qpel functions referenced here are not related to h264 and should
thus never have been under CONFIG_H264QPEL.

Signed-off-by: Mans Rullgard <mans@mansr.com>
Signed-off-by: Diego Biurrun <diego@biurrun.de>
 2012-11-26 01:50:47 +01:00
Paul B Mahol
7d2156aee8 adpcm/thp: make use of ADPCMChannelStatus to store prev samples 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2012-11-26 00:44:45 +00:00
Justin Ruggles
3d3cf6745e aacdec: use float planar sample format for output 2012-11-25 19:06:36 -05:00
Justin Ruggles
8e134e5104 lavc: clarify get_buffer() documentation 
This is needed for the AAC decoder, which may need to call get_buffer()
more than once if the channel configuration changes.
 2012-11-25 19:06:36 -05:00
Justin Ruggles
3ffed68c2a mpegaudiodec: use planar sample format for output unless packed is requested 2012-11-25 19:05:58 -05:00
Michael Niedermayer
66c3bac2b9 Merge commit 'ad01ba6ceaea7d71c4b9887795523438689b5a96' 
* commit 'ad01ba6ceaea7d71c4b9887795523438689b5a96':
  x86: h264: Remove 3dnow QPEL code

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2012-11-26 00:57:33 +01:00
Justin Ruggles
2d3993ce8c x86: h264 qpel: use the correct number of utilized xmm regs in cglobal 
Fixes xmm register clobbering on win64.
 2012-11-25 18:48:43 -05:00
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
Janne Grunau
e96d90eed6 remove #defines to prevent use of discouraged external functions 
Preventing the use of discouraged or 'insecure' external functions
through defines in an internal header is not a good solution. The
header is not guaranteed to be included universally which makes
overlooking bad use of said functions during review more likely.

There are cases were those functions either are the most straight
forward solution or even have to be used. Using malloc or free is
required if the allocation or release is done by other libraries.
 2012-11-25 23:02:04 +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
Daniel Kang
610e00b359 x86: h264: Convert 8-bit QPEL inline assembly to YASM 
Signed-off-by: Diego Biurrun <diego@biurrun.de>
 2012-11-25 20:38:35 +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
Daniel Kang
ad01ba6cea x86: h264: Remove 3dnow QPEL code 
The only CPUs that have 3dnow and don't have mmxext are 12 years old.
Moreover, AMD has dropped 3dnow extensions from newer CPUs.

Signed-off-by: Diego Biurrun <diego@biurrun.de>
 2012-11-25 20:32:55 +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