RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
37,997 Commits 36 Branches 398 Tags 232 MiB
Commit Graph

37997 Commits

Author SHA1 Message Date
Michael Niedermayer 85f25cfa19 ffmpeg: fix passlogfile with multiple libx264 streams. 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-02-12 00:03:26 +01:00
Paul B Mahol 07dbea7033 tta: reindent 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-02-11 23:59:19 +01:00
Pavel Koshevoy 277e52845e Modified to generate PAT/PMT for video keyframes 
This is so that TS fragments produced by
http://code.google.com/p/httpsegmenter/
would be compatible with JW Player.

A new member variable prev_payload_key was added to MpegTSWriteStream
to help detect transition from non-key to key frame, so that
PAT/PMT would not be produced for every keyframe in intra-only videos.

Signed-off-by: Pavel Koshevoy <pkoshevoy@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-02-11 23:57:35 +01:00
Michael Niedermayer 69494fd5c5 lagarith: Fix out of array reads. 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-02-11 23:57:35 +01:00
Carl Eugen Hoyos 2396206fb4 ffv1: Assume encoding all bits is wanted if bits_per_raw_sample == 0. 2012-02-11 23:45:04 +01:00
Carl Eugen Hoyos cadd9ab6aa Cosmetics: Move a block in ffv1's encode_init(). 
Makes the next patch smaller.
 2012-02-11 23:42:58 +01:00
Justin Ruggles b498867d66 FATE: update reference for seek-alac_mp4 
This should have been updated in b590f3a7bf.
 2012-02-11 16:41:01 -05:00
Aneesh Dogra 41afdd913a sunrast: Return AVERROR values instead of -1. 
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
 2012-02-11 13:32:29 -08:00
Aneesh Dogra 4fbccfab23 sunrast: Add support for gray8 decoding. 
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
 2012-02-11 11:05:43 -08:00
Ronald S. Bultje dae2ce361a swscale: enforce a minimum filtersize. 
At very small dimensions, this calculation could lead to zero-sized
filters, which leads to uninitialized output, zero-sized allocations,
loop overflows in SIMD that uses do{..}while(i++<filtersize); instead
of for(i=0;i<filtersize;i++){..} and several other similar failures.
Therefore, require a minimum filtersize of 1.

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
 2012-02-11 10:06:50 -08:00
Justin Ruggles 764852d653 alacenc: use AVCodec.encode2() 2012-02-11 12:49:23 -05:00
Justin Ruggles bee80054f7 alacenc: cosmetics: indentation 2012-02-11 12:49:22 -05:00
Justin Ruggles b6e8ff72ea alacenc: consolidate bitstream writing into a single function. 
Simplifies use of verbatim mode.
 2012-02-11 12:49:22 -05:00
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