generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
71,084 Commits 24 Branches 241 Tags 173 MiB
21175d8586
Commit Graph

71084 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Michael Niedermayer
b14de8e689 avcodec/utils: use atomic operations on entangled_thread_counter 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-03-13 23:59:07 +01:00
Michael Niedermayer
b910c6ca56 configure: fix zlib dependancy of tdsc 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-03-13 23:45:27 +01:00
Michael Niedermayer
88ddcfa37f avcodec/tdsc: use ff_codec_open2_recursive() 
Fixes assertion failure and race conditions

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-03-13 23:23:16 +01:00
Michael Niedermayer
e1f37c48e5 Merge commit '247e370e2a913db52ca079b347a174c8d393b171' 
* commit '247e370e2a913db52ca079b347a174c8d393b171':
  TDSC decoder

Conflicts:
	Changelog
	doc/general.texi
	libavcodec/Makefile
	libavcodec/allcodecs.c
	libavcodec/version.h
	tests/fate/video.mak

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2015-03-13 23:23:01 +01:00
Michael Niedermayer
fa4bb7c5b2 Merge commit '5a0e953c2465be9d449d5f523c3d3e2b886910b2' 
* commit '5a0e953c2465be9d449d5f523c3d3e2b886910b2':
  mjpeg: Mark decoder family as thread safe

Conflicts:
	libavcodec/mjpegbdec.c
	libavcodec/mjpegdec.c
	libavcodec/mxpegdec.c
	libavcodec/sp5xdec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2015-03-13 22:48:54 +01:00
Michael Niedermayer
a048bd44b2 Merge commit '117b432748ca87de4cd0f09d9b1495545e264733' 
* commit '117b432748ca87de4cd0f09d9b1495545e264733':
  lavc: Introduce AVCodec internal capabilities

Conflicts:
	libavcodec/utils.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2015-03-13 22:38:53 +01:00
Michael Niedermayer
79f013a206 Merge commit '9993a067f6c8c7e7838052ac3146aa6b80dd7e81' 
* commit '9993a067f6c8c7e7838052ac3146aa6b80dd7e81':
  lavc: Improve thread locking error message

Conflicts:
	libavcodec/utils.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2015-03-13 22:02:19 +01:00
Diego Biurrun
4da5aacc7e dca: Mark syncword constants unsigned; they do not fit in 32-bit signed int 2015-03-13 21:20:37 +01:00
Vittorio Giovara
247e370e2a TDSC decoder 
Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
 2015-03-13 19:48:14 +00:00
Vittorio Giovara
5a0e953c24 mjpeg: Mark decoder family as thread safe 
No global variables are used and the VLC tables are allocated without
static elements. This will allow using a JPEG decoding context within
other decoders.
 2015-03-13 19:48:07 +00:00
Vittorio Giovara
117b432748 lavc: Introduce AVCodec internal capabilities 
This field is designed for marking codec properties useful to lavc internals.
Two internal capabilities are added:
 - FF_CODEC_CAP_INIT_THREADSAFE: codec can be opened without locks;
 - FF_CODEC_CAP_INIT_CLEANUP: codec frees memory if initialization fails.
 2015-03-13 19:47:47 +00:00
Vittorio Giovara
9993a067f6 lavc: Improve thread locking error message 2015-03-13 19:47:34 +00:00
Zhang Rui
3f375950f3 avformat/http: support auto reconnect 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-03-13 19:07:28 +01:00
Michael Niedermayer
3727cd5416 avformat/flvdec: add support for OnCaption 2015-03-13 16:25:27 +01:00
Michael Niedermayer
1df64d6c46 avformat/flvdec: re enable flv_data_packet() 
Found-by: kurosu
Reviewed-by: Andreas Cadhalpun <andreas.cadhalpun@googlemail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-03-13 16:24:12 +01:00
Michael Niedermayer
7869b2959d avformat/flvdec: Change subtitle stream type to subtitle type 
Previous-version-reviewed-by: Andreas Cadhalpun
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-03-13 16:03:28 +01:00
Michael Niedermayer
7b0daec233 avcodec/svq1dec: Fix undefined shifts 
Found-by: Clang -fsanitize=shift
Reported-by: Thierry Foucu <tfoucu@google.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-03-13 11:55:45 +01:00
Carl Eugen Hoyos
3cd823e46f lavc: Print number of reference frames if debug level >= verbose. 2015-03-13 08:52:36 +01:00
Carl Eugen Hoyos
2e0b5f5c90 lavf: Do not list mov-only codecs in riff.c. 
Instead check for all mov code-points when demuxing avi
and print a warning if a video codec is found like this.
Fixes a regression similar to the one described in ticket #4307.
 2015-03-13 08:49:03 +01:00
Carl Eugen Hoyos
a47c2a1d5f doc: Fix alphabetic ordering for decklink input device. 2015-03-13 01:57:42 +01:00
Christophe Gisquet
2999bd7da2 x86: xvid_idct: port SSE2 iDCT to yasm 
The main difference consists in renaming properly labels, and
letting yasm select the gprs for skipping 1D transforms.

Previous-version-reviewed-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-03-13 01:04:52 +01:00
Michael Niedermayer
8f8c31f4c7 Merge commit '913aa9a4874418724183a3ec862cdc63b829367d' 
* commit '913aa9a4874418724183a3ec862cdc63b829367d':
  libx264: Return more meaningful error codes

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2015-03-13 00:02:27 +01:00
Michael Niedermayer
b0112019f9 Merge commit '6bdae41d3ef74a0865e8f87896e649f93b2f39bd' 
* commit '6bdae41d3ef74a0865e8f87896e649f93b2f39bd':
  matroskadec: Check memory allocations

Conflicts:
	libavformat/matroskadec.c

See: 3e2a5b33f0
Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2015-03-12 23:51:44 +01:00
Michael Niedermayer
9f8f2bcab6 Merge commit 'c3bd1d60af97e8d2568dac9fcce7bdabb4ff93c8' 
* commit 'c3bd1d60af97e8d2568dac9fcce7bdabb4ff93c8':
  formats: Check memory allocations

Conflicts:
	libavfilter/formats.c

See: 527ca3985c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2015-03-12 22:40:56 +01:00
Michael Niedermayer
8b3a681aaa Merge commit '5a2645cafeca1c2207ac55cc831c3349572a82ed' 
* commit '5a2645cafeca1c2207ac55cc831c3349572a82ed':
  nutdec: Prevent leaks on memory error

Conflicts:
	libavformat/nutdec.c

See: 269845db86
Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2015-03-12 22:01:57 +01:00
Michael Niedermayer
98c387c9c1 Merge commit 'edca1dd552efa1ebef016ca9eff4ce6757605819' 
* commit 'edca1dd552efa1ebef016ca9eff4ce6757605819':
  xcbgrab: Check av_strdup() allocation

Conflicts:
	libavdevice/xcbgrab.c

See: db442c8736
Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2015-03-12 21:51:15 +01:00
Michael Niedermayer
a91c175db2 Merge commit '17c45d4d056d0e10ecb88b424ec9e68be398da5e' 
* commit '17c45d4d056d0e10ecb88b424ec9e68be398da5e':
  libtheora: Check frame allocation

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2015-03-12 21:41:55 +01:00
Michael Niedermayer
9ecfe0b878 Merge commit 'a72d93daa09ffbad2771f1450820941055eaf210' 
* commit 'a72d93daa09ffbad2771f1450820941055eaf210':
  mpegvideo_enc: Check AVCodecContext allocation

Conflicts:
	libavcodec/mpegvideo_enc.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2015-03-12 21:30:37 +01:00
Michael Niedermayer
0bc2da6dcf Merge commit '78c892284150e12f6b08b287bdf7e62307c6985f' 
* commit '78c892284150e12f6b08b287bdf7e62307c6985f':
  dca: Document the permuted order in the lfe_fir_64 and lfe_fir_128 tables

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2015-03-12 21:20:24 +01:00
James Almer
d5addf1555 hevcdsp: fix compilation for arm and aarch64 
Also add av_cold to ff_hevcdsp_init_arm.

Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-03-12 20:01:01 +01:00
Himangi Saraogi
913aa9a487 libx264: Return more meaningful error codes 
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
 2015-03-12 19:09:22 +01:00
Vittorio Giovara
6bdae41d3e matroskadec: Check memory allocations 
CC: libav-stable@libav.org
 2015-03-12 17:48:14 +00:00
Vittorio Giovara
c3bd1d60af formats: Check memory allocations 2015-03-12 17:46:47 +00:00
James Cowgill
a251aa1a35 mips/asmdefs: use _ABI64 as defined by gcc 
Unfortunately android < api 21 (lollipop) doesn't have the sgidefs.h header,
the easiest way around this is to just use the preprocessor definitions from
gcc / clang.

Signed-off-by: James Cowgill <james410@cowgill.org.uk>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-03-12 16:45:31 +01:00
Vittorio Giovara
5a2645cafe nutdec: Prevent leaks on memory error 
Bug-Id: CID 205122 / CID 205123
 2015-03-12 15:29:59 +00:00
Vittorio Giovara
edca1dd552 xcbgrab: Check av_strdup() allocation 
Bug-Id: CID 1274038
 2015-03-12 15:29:59 +00:00
Vittorio Giovara
17c45d4d05 libtheora: Check frame allocation 2015-03-12 15:29:59 +00:00
Vittorio Giovara
a72d93daa0 mpegvideo_enc: Check AVCodecContext allocation 2015-03-12 15:29:59 +00:00
Michael Niedermayer
27191b82de avcodec/vp9: Fix undefined shifts in decode_frame_header() 
Found-by: Clang -fsanitize=shift
Reported-by: Thierry Foucu <tfoucu@google.com>
Reviewed-by: "Ronald S. Bultje" <rsbultje@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-03-12 15:31:41 +01:00
Michael Niedermayer
b7cb8b3d43 avcodec/h264_mb: Fix undefined shifts 
Found-by: Clang -fsanitize=shift
Reported-by: Thierry Foucu <tfoucu@google.com>
Reviewed-by: "Ronald S. Bultje" <rsbultje@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-03-12 15:16:46 +01:00
Rainer Hochecker
31816eae32 hevc: delay ff_thread_finish_setup for hwaccel 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-03-12 14:49:41 +01:00
Niels Möller
78c8922841 dca: Document the permuted order in the lfe_fir_64 and lfe_fir_128 tables 2015-03-12 13:28:42 +01:00
Michael Niedermayer
22af79a9c8 Merge commit 'b97f427fb56bdbf7de8e2d4b72d01114aa6eceda' 
* commit 'b97f427fb56bdbf7de8e2d4b72d01114aa6eceda':
  lavf: Explicitly convert types at function pointer assignment

Conflicts:
	libavformat/avio.c
	libavformat/aviobuf.c
	libavformat/swfenc.c

See: a76a2ffe9d and others
Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2015-03-12 12:38:20 +01:00
Michael Niedermayer
7d63f10c37 Merge commit '9c8074050745184a61059ad56045ad711299e33d' 
* commit '9c8074050745184a61059ad56045ad711299e33d':
  configure: Mark qsv subsystem as not selectable on the command line

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2015-03-12 12:25:39 +01:00
Yayoi
d5232d4717 avfilter/colormatrix:add slice threading 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-03-12 03:45:42 +01:00
Michael Niedermayer
26d81b5703 avutil/buffer: Avoid moving the AVBufferRef to a new place in memory in av_buffer_make_writable() 
This allows making a AVBufferRef writable without the need to
update all pointers to it

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-03-12 02:15:28 +01:00
Michael Niedermayer
35fad1e9c9 avutil/buffer: Avoid moving the AVBufferRef to a new place in memory in av_buffer_realloc() 
This allows reallocating AVBufferRefs without the need to update
all pointers to it

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-03-12 02:15:28 +01:00
Michael Niedermayer
3bedc99723 Merge commit '67142a8c721c7916c9ad2eb439c14d567aeb88c1' 
* commit '67142a8c721c7916c9ad2eb439c14d567aeb88c1':
  roqvideoenc: set enc->avctx in roq_encode_init

See: cf82c426fa
Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2015-03-12 00:32:03 +01:00
Michael Niedermayer
a277c545b2 Merge commit '72211a2af0470799c9611b9c1c7039ab14a34a0a' 
* commit '72211a2af0470799c9611b9c1c7039ab14a34a0a':
  asfenc: fix leaking asf->index_ptr on error

See: 2c8cff2be4
Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2015-03-12 00:24:05 +01:00
Michael Niedermayer
e197dc04bb Merge commit '212556cd2144659dc6b9d121ddb38cd272bd10ae' 
* commit '212556cd2144659dc6b9d121ddb38cd272bd10ae':
  qsv: Improve the log message of when initializing MFX_IMPL_HARDWARE{2, 3, 4}

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2015-03-12 00:15:58 +01:00