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

15 Commits

Author SHA1 Message Date
Michael Niedermayer 6968a7d193 Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  doc/general: update supported devices table.
  doc/general: add missing @tab to codecs table.
  h264: Fix invalid interlaced/progressive MB combinations for direct mode prediction.
  avconv: reindent
  avconv: link '-passlogfile' option to libx264 'stats' AVOption.
  libx264: add 'stats' private option for setting 2pass stats filename.
  libx264: fix help text for slice-max-size option.
  http: Clear the auth state on redirects
  http: Retry auth if it failed due to being stale
  rtsp: Resend new keepalive commands if they used stale auth
  rtsp: Retry authentication if failed due to being stale
  httpauth: Parse the stale field in digest auth
  dxva2_vc1: pass the overlap flag to the decoder
  dxva2_vc1: fix decoding of BI frames
  FATE: add shorthand to wavpack test
  dfa: convert to bytestream2 API
  anm decoder: move buffer allocation from decode_init() to decode_frame()
  h264: improve parsing of broken AVC SPS

Conflicts:
	ffmpeg.c
	libavcodec/anm.c
	libavcodec/dfa.c
	libavcodec/h264.c
	libavcodec/h264_direct.c
	libavcodec/h264_ps.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2012-03-14 02:10:11 +01:00
Paul B Mahol 29b0d94b43 dfa: convert to bytestream2 API 
Protects from overreads.

Signed-off-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
 2012-03-12 21:47:40 -07:00
Reimar Döffinger 0b378e8aa9 DFA: fix "skip frame" TSW1 encoding. 
Previously the decoder would raise an error.
The end result is the same, the time stamps only change
because regression tests create time stamps incorrectly.

Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
 2012-01-28 21:59:01 +01:00
Carl Eugen Hoyos e18f70c2d1 Set Chronomaster DFA palette opaque. 2011-11-12 20:05:35 +01:00
Carl Eugen Hoyos 320f0f04a1 Fix Chronomaster DFA palette. 
The palette had a blue cast.
 2011-11-12 20:03:44 +01:00
Michael Niedermayer faba79e080 Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  mxfdec: Include FF_INPUT_BUFFER_PADDING_SIZE when allocating extradata.
  H.264: tweak some other x86 asm for Atom
  probe: Fix insane flow control.
  mpegts: remove invalid error check
  s302m: use nondeprecated audio sample format API
  lavc: use designated initialisers for all codecs.
  x86: cabac: add operand size suffixes missing from 6c32576

Conflicts:
	libavcodec/ac3enc_float.c
	libavcodec/flacenc.c
	libavcodec/frwu.c
	libavcodec/pictordec.c
	libavcodec/qtrleenc.c
	libavcodec/v210enc.c
	libavcodec/wmv2dec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2011-07-30 06:46:08 +02:00
Anton Khirnov ec6402b7c5 lavc: use designated initialisers for all codecs. 
It's more readable and less prone to breakage.
 2011-07-29 08:42:34 +02:00
Diego Biurrun b1bb3b8d87 dfa: Remove unused variable. 
This fixes the warning:
libavcodec/dfa.c:189: warning: unused variable ‘frame_end’
 2011-05-15 13:12:47 +02:00
Reimar Döffinger 2c9a5172d3 dfa: fix buffer overflow checks to avoid integer overflows. 
Signed-off-by: Anton Khirnov <anton@khirnov.net>
 2011-05-13 07:38:54 +02:00
Michael Niedermayer 334187ade7 Fix "libavcodec/dfa.c:189: warning: unused variable ‘frame_end’" 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-05-04 23:33:59 +02:00
Reimar Döffinger 65daa942eb Fix buffer overflow checks to avoid integer overflows. 2011-03-30 09:15:52 +02:00
Michael Niedermayer 445fdc0140 Merge remote-tracking branch 'newdev/master' 
* newdev/master:
  ac3enc: move compute_mantissa_size() to ac3dsp
  ac3enc: move mant*_cnt and qmant*_ptr out of AC3EncodeContext
  Remove support for stripping executables
  ac3enc: NEON optimised float_to_fixed24
  ac3: move ff_ac3_bit_alloc_calc_bap to ac3dsp
  dfa: protect pointer range checks against overflows.
Duplicate:  mimic: implement multithreading.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2011-03-30 03:09:08 +02:00
Ronald S. Bultje d38345878c dfa: protect pointer range checks against overflows. 2011-03-29 07:14:44 -07:00
Michael Niedermayer 59bf303d68 Merge remote-tracking branch 'newdev/master' 
* newdev/master:
  ac3enc: avoid memcpy() of exponents and baps in EXP_REUSE case by using exponent reference blocks.
  Chronomaster DFA decoder
DUPLICATE:  framebuffer device demuxer
NOT MERGED: cosmetics: fix dashed line length after 070c5d0
  http: header field names are case insensitive

Conflicts:
	LICENSE
	README
	doc/indevs.texi
	libavdevice/fbdev.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2011-03-29 02:46:11 +02:00
Kostya Shishkov 42315dabce Chronomaster DFA decoder 
Signed-off-by: Anton Khirnov <anton@khirnov.net>
 2011-03-28 16:55:03 +02:00