virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-06-20 06:16:02 +02:00
Code Issues Releases Activity
39,434 Commits 37 Branches 405 Tags
2b6325cacb6def8e9de0455f575b51a8bd90b12c
Commit Graph

39434 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Justin Ruggles
b590f3a7bf alacenc: only encode frame size in header for a final smaller frame 
Otherwise it is not needed because it matches the frame size as encoded in
the extradata.
 2012-02-11 12:49:22 -05:00
Justin Ruggles
ba821b098b alacenc: store current frame size in AlacEncodeContext. 
This avoids an indirection and will simplify implementation of encode2()
 2012-02-11 12:49:22 -05:00
Justin Ruggles
65d15aec77 alacenc: return AVERROR codes in alac_encode_frame() 2012-02-11 12:49:22 -05:00
Justin Ruggles
302daf5800 alacenc: calculate a new max frame size for the final small frame 
Gives a better estimate of buffer requirements and a better decision of
whether or not to use verbatim mode.
 2012-02-11 12:49:22 -05:00
Justin Ruggles
fc9cf0b2a6 alacenc: pretty-printing and other cosmetics 2012-02-11 12:49:22 -05:00
Justin Ruggles
51c2483862 alacenc: fix error handling and potential memleaks in alac_encode_init() 2012-02-11 12:49:22 -05:00
Justin Ruggles
6e63228323 alacenc: do not set coded_frame->key_frame 
It is already set in avcodec_alloc_frame()
 2012-02-11 12:49:21 -05:00
Justin Ruggles
64fe3eaeb3 alacenc: do not set bits_per_coded_sample 
encoded ALAC does not have a fixed number of bits per sample
 2012-02-11 12:49:21 -05:00
Justin Ruggles
43a4cb070b alacenc: remove unneeded frame_size check in alac_encode_frame() 2012-02-11 12:49:21 -05:00
Ronald S. Bultje
7416d61036 tta: error out if samplerate is zero. 
Prevents a division by zero later on.

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
 2012-02-11 08:13:53 -08:00
Michael Niedermayer
fd0b8d5986 ansi: Fix use of uninitalized width/height warning. 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-02-11 08:23:42 +01:00
Justin Ruggles
6ab681a4c1 ttadec: fix invalid free when an error occurs while decoding 24-bit tta 2012-02-10 20:35:10 -05:00
Justin Ruggles
9d7cee50aa wavpack: add needed braces for 2 statements inside an if block 2012-02-10 20:27:55 -05:00
Michael Niedermayer
ed83f97235 tta: Add some safety precautions to avoid freeing things that have not been allocated. 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-02-11 02:06:24 +01:00
Paul B Mahol
c6abf21492 tta: do not leak memory if bps == 3 
In bps == 3 case output is decoded directly.

Signed-off-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-02-11 02:02:01 +01:00
Ingo Brückl
a697a185e4 buildsys: Fix shared lib build of MPlayer. 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-02-11 01:40:52 +01:00
Michael Niedermayer
a78f6b8cb9 Merge remote-tracking branch 'qatar/master' 
* qatar/master: (38 commits)
  v210enc: remove redundant check for pix_fmt
  wavpack: allow user to disable CRC checking
  v210enc: Use Bytestream2 functions
  cafdec: Check return value of avio_seek and avoid modifying state if it fails
  yop: Check return value of avio_seek and avoid modifying state if it fails
  tta: Check return value of avio_seek and avoid modifying state if it fails
  tmv: Check return value of avio_seek and avoid modifying state if it fails
  r3d: Check return value of avio_seek and avoid modifying state if it fails
  nsvdec: Check return value of avio_seek and avoid modifying state if it fails
  mpc8: Check return value of avio_seek and avoid modifying state if it fails
  jvdec: Check return value of avio_seek and avoid modifying state if it fails
  filmstripdec: Check return value of avio_seek and avoid modifying state if it fails
  ffmdec: Check return value of avio_seek and avoid modifying state if it fails
  dv: Check return value of avio_seek and avoid modifying state if it fails
  bink: Check return value of avio_seek and avoid modifying state if it fails
  Check AVCodec.pix_fmts in avcodec_open2()
  svq3: Prevent illegal reads while parsing extradata.
  remove ParseContext1
  vc1: use ff_parse_close
  mpegvideo parser: move specific fields into private context
  ...

Conflicts:
	libavcodec/4xm.c
	libavcodec/aacdec.c
	libavcodec/h264.c
	libavcodec/h264.h
	libavcodec/h264_cabac.c
	libavcodec/h264_cavlc.c
	libavcodec/mpeg4video_parser.c
	libavcodec/svq3.c
	libavcodec/v210enc.c
	libavformat/cafdec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2012-02-11 01:22:22 +01:00
Reimar Döffinger
394d41ee30 Partially revert "Fix png decoding on x86." 
This partially reverts commit 58dabf7bf2.
It is no longer necessary to use unaligned mov.
The swapped mov argument fix remains though.
 2012-02-10 23:18:52 +01:00
Reimar Döffinger
3fe00cac71 Fix bitexact intra mismatch control. 
The DC coefficient should be included, too.
This probably was missed because DC quantizer is always
even for MPEG-1/2 but this function is also used for MPEG-4.

Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
 2012-02-10 23:18:52 +01:00
Reimar Döffinger
5338566eaf mpegvideodec: minor simplifications. 
Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
 2012-02-10 23:18:52 +01:00
Michael Niedermayer
af46ca7356 msmpeg4: replace 999999 by INT_MAX and initial by a valid index. 
Fixes Ticket990

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-02-10 22:50:16 +01:00
Paul B Mahol
f98ede7e61 v210enc: remove redundant check for pix_fmt 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Justin Ruggles <justin.ruggles@gmail.com>
 2012-02-10 15:59:23 -05:00
Paul B Mahol
c388558d31 wavpack: allow user to disable CRC checking 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Justin Ruggles <justin.ruggles@gmail.com>
 2012-02-10 15:54:08 -05:00
Aneesh Dogra
eeb9e61a51 v210enc: Use Bytestream2 functions 
Signed-off-by: Justin Ruggles <justin.ruggles@gmail.com>
 2012-02-10 15:38:24 -05:00
Joakim Plate
af701d42c3 cafdec: Check return value of avio_seek and avoid modifying state if it fails 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Justin Ruggles <justin.ruggles@gmail.com>
 2012-02-10 15:27:50 -05:00
Joakim Plate
b69c2e0e6d yop: Check return value of avio_seek and avoid modifying state if it fails 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Justin Ruggles <justin.ruggles@gmail.com>
 2012-02-10 15:27:50 -05:00
Joakim Plate
e54165aa39 tta: Check return value of avio_seek and avoid modifying state if it fails 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Justin Ruggles <justin.ruggles@gmail.com>
 2012-02-10 15:27:49 -05:00
Joakim Plate
066ad0926a tmv: Check return value of avio_seek and avoid modifying state if it fails 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Justin Ruggles <justin.ruggles@gmail.com>
 2012-02-10 15:27:49 -05:00
Joakim Plate
c7b08bc0a7 r3d: Check return value of avio_seek and avoid modifying state if it fails 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Justin Ruggles <justin.ruggles@gmail.com>
 2012-02-10 15:27:49 -05:00
Joakim Plate
8dcd00eabd nsvdec: Check return value of avio_seek and avoid modifying state if it fails 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Justin Ruggles <justin.ruggles@gmail.com>
 2012-02-10 15:27:49 -05:00
Joakim Plate
97aa092997 mpc8: Check return value of avio_seek and avoid modifying state if it fails 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Justin Ruggles <justin.ruggles@gmail.com>
 2012-02-10 15:27:49 -05:00
Joakim Plate
9712e82a4e jvdec: Check return value of avio_seek and avoid modifying state if it fails 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Justin Ruggles <justin.ruggles@gmail.com>
 2012-02-10 15:27:49 -05:00
Joakim Plate
64476d7ee8 filmstripdec: Check return value of avio_seek and avoid modifying state if it fails 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Justin Ruggles <justin.ruggles@gmail.com>
 2012-02-10 15:27:49 -05:00
Joakim Plate
d7c11b114b ffmdec: Check return value of avio_seek and avoid modifying state if it fails 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Justin Ruggles <justin.ruggles@gmail.com>
 2012-02-10 15:27:49 -05:00
Joakim Plate
8332321c57 dv: Check return value of avio_seek and avoid modifying state if it fails 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Justin Ruggles <justin.ruggles@gmail.com>
 2012-02-10 15:27:49 -05:00
Joakim Plate
3371e89640 bink: Check return value of avio_seek and avoid modifying state if it fails 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Justin Ruggles <justin.ruggles@gmail.com>
 2012-02-10 15:27:49 -05:00
Clément Bœsch
a3c4371f3c ffmpeg: prefer NULL over 0 for av_log context pointer parameter. 2012-02-10 20:47:42 +01:00
Clément Bœsch
158bd596a6 ffmpeg: move quality parameter to do_video_out() scope. 
This make do_video_out() and do_audio_out() consistent. Also simplifies
callers.
 2012-02-10 20:13:36 +01:00
Clément Bœsch
63b5e99fab ffmpeg: make use of ret error out in transcode_video(). 2012-02-10 20:13:36 +01:00
Clément Bœsch
086fc4d765 ffmpeg: move filtered_frame to the CONFIG_AVFILTER scope. 
This simplifies a bit the #ifdefery.
 2012-02-10 20:13:36 +01:00
Clément Bœsch
9303b794b8 ffmpeg: move do_video_stats() above do_video_out(). 
This avoid a forward declaration.
 2012-02-10 20:12:52 +01:00
Clément Bœsch
a78dd826ee ffmpeg: move video stats code to do_video_out(). 
This will allow some simplifications in transcode_video().
 2012-02-10 20:12:52 +01:00
Clément Bœsch
cf31060127 ffmpeg: move filtered_frame to video stream processing scope. 2012-02-10 20:12:52 +01:00
Clément Bœsch
aede21f1b6 ffmpeg: reindent after video frame polling simplification. 2012-02-10 19:59:38 +01:00
Clément Bœsch
e22c7b4e25 ffmpeg: simplify video frame polling. 
input_video_filter and output_video_filter can't be NULL at this point.
If they are, the current code would likely crash anyway (since
filtered_frame would be NULL and sent to do_video_out().
 2012-02-10 19:59:38 +01:00
Clément Bœsch
4ab4b3db5a ffmpeg: use exit_program() if configure_video_filters() fails. 2012-02-10 19:59:38 +01:00
Paul B Mahol
dcd2b55e1a Check AVCodec.pix_fmts in avcodec_open2() 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Justin Ruggles <justin.ruggles@gmail.com>
 2012-02-10 13:24:37 -05:00
Alex Converse
9e1db721c4 svq3: Prevent illegal reads while parsing extradata. 
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
 2012-02-10 09:57:39 -08:00
Carl Eugen Hoyos
3546f680d5 Add missing newline to mpeg1/2 intra matrix error message. 2012-02-10 17:50:50 +01:00
Carl Eugen Hoyos
baa8ec8d74 Add missing swscale dependency for MP-filters. 
Reported-by: Hanspeter Niederstrasser

Fixes ticket #989.
 2012-02-10 17:39:36 +01:00