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

56666 Commits

Author SHA1 Message Date
Michael Niedermayer b637118086 avformat/mpegenc: change assert to av_assert0 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-09-26 02:16:12 +02:00
Michael Niedermayer ddd0e23d58 avformat/mpegenc: improve field names in underflow error message 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-09-26 01:07:24 +02:00
Michael Niedermayer 851a6e2f1a avcodec/wmalosslessdec: Fix return code for invalid buffer sizes 
Fixes infinite loop
Fixes Ticket2979

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-09-25 21:50:27 +02:00
Paul B Mahol f5498ef38d avcodec/flicvideo: fix infinite loops 
Fixes #2995.
Reported-by: Piotr Bandurski <ami_stuff@o2.pl>
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-09-25 19:45:49 +00:00
Michael Niedermayer c99d27287d avcodec/wmaprodec: check that there are input bits left in decode_subframe_length() 
Fixes infinite loop
Fixes Ticket2987

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-09-25 20:10:24 +02:00
Michael Niedermayer 45f0623ae3 avcodec/lagarith: check scaled probabilities 
Prevents infinite loop
Fixes Ticket2988

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-09-25 18:26:13 +02:00
Michael Niedermayer ab6fbe8206 avcodec/cabac: remove h264_lps_state 
The only use case of it was the selftest code, and there the slightly more
complex indexing that is needed after its removial doesnt matter.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-09-25 16:30:25 +02:00
Michael Niedermayer c3c6999ea1 Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  lavc doxy: document that avcodec_flush_buffers() invalidates decoded frames

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-09-25 11:02:32 +02:00
Michael Niedermayer 9b3d4258d9 Merge commit '2725f2d40315b56f17c5dffe39dda7d94786302d' 
* commit '2725f2d40315b56f17c5dffe39dda7d94786302d':
  doc/filters: fix an option name in the unsharp docs

Conflicts:
	doc/filters.texi

See: b7b72963e0
Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-09-25 10:53:32 +02:00
Michael Niedermayer 4a89868c5f Merge commit 'cab8c5f8e140c96ba3725ab709d823abfd1e31a5' 
* commit 'cab8c5f8e140c96ba3725ab709d823abfd1e31a5':
  h264: do not reinitialize the global cabac tables at each slice header

See: 1e2e2c8095
Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-09-25 10:25:17 +02:00
Michael Niedermayer b0b66269f4 Merge commit 'e880418660c80e2f12a123e131975cdb6b12cd13' 
* commit 'e880418660c80e2f12a123e131975cdb6b12cd13':
  cabac: remove write-only h264_mps_state[]

Conflicts:
	libavcodec/cabac.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-09-25 10:02:09 +02:00
Michael Niedermayer 57070d9892 Merge commit '668643b9239c70b777aea322eab411ebc960d9a0' 
* commit '668643b9239c70b777aea322eab411ebc960d9a0':
  matroskadec: check av_strdup() when setting defaults

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-09-25 09:39:24 +02:00
Michael Niedermayer 65bf9a44d7 avcodec/pngdec: check for stream end in png_decode_idat() 
Fix infinite loop
Fix Ticket2978

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-09-25 02:17:36 +02:00
Michael Niedermayer bb4b041df3 avcodec/mpegvideo_enc: check qmin/qmax 
Fixes Ticket2990

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-09-25 00:44:17 +02:00
Michael Niedermayer c88ac1e023 avcodec/g2meet: fix regression with rgb cursors 
Fixes Ticket2972

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-09-25 00:25:23 +02:00
Anton Khirnov 5f4b1b1cbd lavc doxy: document that avcodec_flush_buffers() invalidates decoded frames 2013-09-24 17:34:00 +02:00
Anton Khirnov 2725f2d403 doc/filters: fix an option name in the unsharp docs 2013-09-24 17:22:11 +02:00
Michael Niedermayer dcc7686ae7 avcodec/mpegvideo: drop emu edge check from chroma_4mv_motion_lowres() 
This is in line with the other functions

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-09-24 17:15:24 +02:00
Anton Khirnov cab8c5f8e1 h264: do not reinitialize the global cabac tables at each slice header 2013-09-24 17:13:52 +02:00
Anton Khirnov e880418660 cabac: remove write-only h264_mps_state[] 2013-09-24 17:13:17 +02:00
Anton Khirnov 668643b923 matroskadec: check av_strdup() when setting defaults 2013-09-24 17:11:50 +02:00
Alex Smith 2599a62fbb ffhash: Change size to an int 
This fixes compilation with MSVC and ICL, and makes ffhash consistent
with how the rest of the codebase uses read().

Reviewed-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-09-24 16:29:18 +02:00
Michael Niedermayer 4fdf2fa94a Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  lavc: add support for interleaved chroma formats to libx264.

Conflicts:
	libavcodec/libx264.c

See: 283fb76d3d
Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-09-24 15:53:50 +02:00
Michael Niedermayer 1fb0d96114 Merge commit 'a454dec19aa6666b555deec431bc42eda391d7b6' 
* commit 'a454dec19aa6666b555deec431bc42eda391d7b6':
  pixdesc: fix NV20* descriptors
  h264_sei: check SEI size

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-09-24 15:51:08 +02:00
Michael Niedermayer d195e6e410 Merge commit '71cabb521ac397db3903011d2de7afd3e0fc7ab6' 
* commit '71cabb521ac397db3903011d2de7afd3e0fc7ab6':
  h264: do not discard NAL_SEI when skipping frames

Conflicts:
	libavcodec/h264.c

See: 7d75fb381b
Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-09-24 15:38:34 +02:00
Michael Niedermayer af2bb83dff Merge commit 'edaba18021e4793116f0f266e65077578a5e742e' 
* commit 'edaba18021e4793116f0f266e65077578a5e742e':
  h264: log extradata skip only for non-ignored NALs

Conflicts:
	libavcodec/h264.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-09-24 15:30:21 +02:00
Michael Niedermayer 9c2e31c3b3 Merge commit '26179964ff3fa1173e6f512c5735ba8223e2395d' 
* commit '26179964ff3fa1173e6f512c5735ba8223e2395d':
  h264_sei: log unknown sei messages

Conflicts:
	libavcodec/h264_sei.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-09-24 15:03:32 +02:00
Michael Niedermayer 0ebc372856 Merge commit '5f24fe82e5fcf227abb5ebf62aa9bc246fda8c0d' 
* commit '5f24fe82e5fcf227abb5ebf62aa9bc246fda8c0d':
  mpegvideo: Initialize chroma_*_shift and codec_tag even if the size is 0

Conflicts:
	libavcodec/mpegvideo.c

The chroma_*_shift and codec_tag code was not under a size!=0 check in ffmpeg

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-09-24 14:55:14 +02:00
Michael Niedermayer ab0b1fdd17 Merge commit 'd6d27f3e58e6980bce4a490e7d8cc0f6a84521fe' 
* commit 'd6d27f3e58e6980bce4a490e7d8cc0f6a84521fe':
  configure: Enable -Qansi-alias for icl 14+

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-09-24 14:35:52 +02:00
Kieran Kunhya 58894ab3f9 lavc: add support for interleaved chroma formats to libx264. 
Interleaved chroma is x264's native format

Signed-off-by: Anton Khirnov <anton@khirnov.net>
 2013-09-24 14:15:04 +02:00
Michael Niedermayer a454dec19a pixdesc: fix NV20* descriptors 
They were inconsistent (overlapping fields and wrong sizes)

Signed-off-by: Anton Khirnov <anton@khirnov.net>
 2013-09-24 14:02:10 +02:00
Rainer Hochecker 71cabb521a h264: do not discard NAL_SEI when skipping frames 
Setting AVDISCARD_NONREF (e.g. after flushing) resulted in 100% dropped frames.

Signed-off-by: Anton Khirnov <anton@khirnov.net>
 2013-09-24 13:24:29 +02:00
Michael Niedermayer 84df6d6a85 h264_sei: check SEI size 
Signed-off-by: Anton Khirnov <anton@khirnov.net>
 2013-09-24 13:24:29 +02:00
Vittorio Giovara edaba18021 h264: log extradata skip only for non-ignored NALs 
Signed-off-by: Anton Khirnov <anton@khirnov.net>
 2013-09-24 13:24:28 +02:00
Vittorio Giovara 26179964ff h264_sei: log unknown sei messages 
Signed-off-by: Anton Khirnov <anton@khirnov.net>
 2013-09-24 13:24:28 +02:00
Martin Storsjö 5f24fe82e5 mpegvideo: Initialize chroma_*_shift and codec_tag even if the size is 0 
This fixes breakage in a few fate tests on certain setups
(that for some reason didn't break on OS X) after the previous
commit (8812a8057). Currently, some video streams are initialized
in ff_MPV_common_init with width/height set at 0 and only changed
to a proper video size with ff_MPV_common_frame_size_change later.

The breakage was diagnosed by Anton Khirnov.

Signed-off-by: Martin Storsjö <martin@martin.st>
 2013-09-24 14:02:23 +03:00
Alex Smith d6d27f3e58 configure: Enable -Qansi-alias for icl 14+ 
Qansi-alias worked on 12.x, then caused miscompilation on 13.x, but now
works again passing all FATE tests for icl version 14.

Signed-off-by: Diego Biurrun <diego@biurrun.de>
 2013-09-24 11:29:00 +02:00
Michael Niedermayer 17513f4fb3 Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  h263dec: Remove a hack that can cause infinite loops

Conflicts:
	libavcodec/h263dec.c

See: d2981b8ef1
Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-09-24 10:59:22 +02:00
Michael Niedermayer 15d4965239 avcodec/mjpegenc: dont store DQT for LJPEG 
This may improve compatibility of lgpegs generated by libavcodec
also encoded ljpegs become slightly smaller

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-09-24 01:21:03 +02:00
Michael Niedermayer fb45de779c avformat/omadec: simplify checks in nprobe() 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-09-24 00:29:02 +02:00
Lukasz Marek 23ad4d6f58 doc/outdevs: add sdl window_fullscreen option 
Signed-off-by: Lukasz Marek <lukasz.m.luki@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-09-23 23:37:14 +02:00
Martin Storsjö 8812a8057f h263dec: Remove a hack that can cause infinite loops 
The actual usefulness of the hack is not known, and it does cause
infinite loops with some broken input files.

CC: libav-stable@libav.org
Signed-off-by: Martin Storsjö <martin@martin.st>
 2013-09-23 23:14:49 +03:00
Ronald S. Bultje 34b429d5ba vp8: fix PPC assembly and bilinear C code to work if src_stride != dst_stride. 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-09-23 15:23:53 +02:00
Michael Niedermayer 3f3867ca27 Merge remote-tracking branch 'cigaes/master' 
* cigaes/master:
  lavfi/dualinput: reimplement on top of framesync.
  lavfi: add an API to synchronize multiple video inputs.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-09-23 15:04:09 +02:00
Michael Niedermayer 356031348c avcodec/vc1dec: fix propagating error codes from various functions 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-09-23 14:57:30 +02:00
Michael Niedermayer a51f3b53fe avcodec/vc1dec: Fix return code on malloc() failure from ff_vc1_decode_init_alloc_tables() 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-09-23 14:54:57 +02:00
Michael Niedermayer 552945efe6 Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  movenchint: Clear size and len if the realloc failed

Conflicts:
	libavformat/movenchint.c

See: 63621762ec
Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-09-23 14:52:20 +02:00
Michael Niedermayer 8c766228c1 Merge commit 'f2b00a5372bfa1d82a8ab99cb8eafac8a9473494' 
* commit 'f2b00a5372bfa1d82a8ab99cb8eafac8a9473494':
  movenc: Return a proper error code for invalid combinations

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-09-23 14:40:18 +02:00
Michael Niedermayer 50138a9235 Merge commit '23d6ba2c44540eb39c6880e4cbd527d297d264a9' 
* commit '23d6ba2c44540eb39c6880e4cbd527d297d264a9':
  vc1dec: Check the error handling flags on slice/field header decode errors

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-09-23 14:34:36 +02:00
Michael Niedermayer eeeb3c8fa3 Merge commit 'f7e616959aff8706edccdae763c24c897c449f6f' 
* commit 'f7e616959aff8706edccdae763c24c897c449f6f':
  electronicarts: Check packet sizes before reading

Conflicts:
	libavformat/electronicarts.c

See: fb1ea777b3
Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-09-23 14:27:09 +02:00