RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
63,022 Commits 36 Branches 392 Tags 316 MiB
Commit Graph

28406 Commits

Author SHA1 Message Date
Matt Oliver 1898c2f49d inline asm: fix arrays as named constraints. 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-05-07 15:02:45 +02:00
Michael Niedermayer 326463893b avcodec/wavpack: initialize pointers to silence warning about them possibly being uninitialized 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-05-07 02:13:56 +02:00
Michael Niedermayer 84655bdaed avcodec/hevc: remove unused variable 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-05-07 02:07:12 +02:00
Michael Niedermayer fc7d0d8201 avcodec/x86/hevcdsp_init: fix SSE4 checks 
Found-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-05-06 18:27:49 +02:00
Michael Niedermayer 7be230b5fa avcodec/x86/Makefile: remove duplicate line 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-05-06 18:23:42 +02:00
Michael Niedermayer 3b3db02f2e avcodec/x86/hevcdsp_init: fix build on 32bit 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-05-06 18:23:42 +02:00
plepere 7a2491c436 HEVC : added assembly MC functions 
pretty print x86

Reviewed-by: "Ronald S. Bultje" <rsbultje@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-05-06 18:23:36 +02:00
Mickaël Raulet 83976e40e8 hevc: C code update for new motion compensation 
pretty print C

Reviewed-by: "Ronald S. Bultje" <rsbultje@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-05-06 18:22:34 +02:00
Matt Oliver ac9869ffb0 x86/mpegaudiodsp.c: msvc compilation error without sse/avx_external 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-05-06 14:15:02 +02:00
Michael Niedermayer 7db0f9bef1 avcodec/mpeg4videoenc: fix alternative implementation of mpeg4_encode_dc() 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-05-06 05:36:10 +02:00
Michael Niedermayer 141a84688f avcodec/mpeg4videodec: fix mcbpc error messages 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-05-06 05:34:00 +02:00
Michael Niedermayer 2baf1c8c60 avcodec/snowenc: Fix "incompatible pointer type" warning 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-05-06 01:03:58 +02:00
Michael Niedermayer 89d2fc62db avcodec/svq3: Fix "incompatible pointer type" warnings 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-05-05 23:30:35 +02:00
Michael Niedermayer ba040d4c8c Merge commit '3828eb8519c1530392ab8820b1aa784602128afc' 
* commit '3828eb8519c1530392ab8820b1aa784602128afc':
  libfdk-aac: Relicense the library wrappers to 2-clause BSD

Conflicts:
	libavcodec/libfdk-aacdec.c
	libavcodec/libfdk-aacenc.c

<Daemon404> michaelni, fyi, for the fdk relicensing, wbs also contact all the ffmpeg-only contributers
<Daemon404> so it should be fine to merge.

Thanks-to: Martin Storsjö <martin@martin.st>
Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-05-05 16:18:15 +02:00
Martin Storsjö 3828eb8519 libfdk-aac: Relicense the library wrappers to 2-clause BSD 
This should make it possible for Fraunhofer to contribute to these
wrappers - they didn't want to contribute to code under LGPL2.1 with
the "or any later version" clause (which allowed using the code
under the LGPL3 license).

Signed-off-by: Martin Storsjö <martin@martin.st>
 2014-05-05 14:18:43 +03:00
Jean First 15fa856b82 libfdk-aacenc: Enable 7.1 channel encoding 
7.1(wide) and 7.1(wide-side) channel layouts are supported in
fdk-aac since the 0.1.3 release.

The earlier versions of fdk-aac didn't include any library
version defines in the public headers, thus checking for
the AACENCODER_LIB_VL0 define is enough to know that we're
building against a new enough version of fdk-aac.

This change includes contributions by Tim Walker,
Michael Niedermayer and Timothy Gu.

Signed-off-by: Martin Storsjö <martin@martin.st>
 2014-05-05 14:01:53 +03:00
Michael Niedermayer ebf2c2c3a8 avcodec/lossless_videodsp: fix incompatible pointer type warning 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-05-05 05:49:18 +02:00
Michael Niedermayer 336901e060 avcodec/h263dec: use AV_EF_IGNORE_ERR 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-05-04 13:24:40 +02:00
Michael Niedermayer d7ade20adb avcodec: add AV_EF_IGNORE_ERR 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-05-04 13:24:40 +02:00
Michael Niedermayer 0c06ca7a8a Merge commit 'a90d92ce2aeea8eaae5c616958d20e000e20b964' 
* commit 'a90d92ce2aeea8eaae5c616958d20e000e20b964':
  aac: K&R formatting cosmetics

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-05-03 23:21:26 +02:00
Michael Niedermayer 3ea5beab8f Merge commit 'c6b42e85493915a3c3891345f57422f9031a0b4f' 
* commit 'c6b42e85493915a3c3891345f57422f9031a0b4f':
  flv: K&R formatting cosmetics

Conflicts:
	libavcodec/flvdec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-05-03 23:15:37 +02:00
Michael Niedermayer 0a5cc20d4a avcodec/jpeglsdec: add cast to silence pointer type warning 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-05-03 22:54:01 +02:00
Michael Niedermayer a520d8fd35 avcodec/snow_dwt: fix "incompatible pointer type" warnings 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-05-03 22:49:21 +02:00
Michael Niedermayer 5918c5a4cc avcodec/kgv1dec: add casts to silence "assignment from incompatible pointer type" 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-05-03 22:09:26 +02:00
Michael Niedermayer bb605ef8ab avcodec/xbmdec: fix pointer type warnings 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-05-03 22:07:54 +02:00
Michael Niedermayer 56cc178485 avcodec/h263dec: fix "incompatible pointer type" warning 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-05-03 20:23:12 +02:00
Michael Niedermayer 77df9de78c avcdoec/snowenc: use av_mallocz_array() 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-05-03 20:08:18 +02:00
Michael Niedermayer cc86158173 avcodec/ffv1dec: use av_malloc_array() 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-05-03 20:08:18 +02:00
Luca Barbato 925c37874b vp9: Read the frame size as unsigned 
Sample-Id: 00001723-google
Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
 2014-05-03 18:25:17 +02:00
Matt Oliver 3c3e02b8d1 x86/cavdsp: prevent named constraints appearing twice. 2014-05-03 17:47:55 +02:00
Michael Niedermayer 7ef01a7878 avcodec/h264: mark recovery_cnt==0 frames as keyframes 
Fixes Ticket3063

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-05-03 16:01:45 +02:00
Carl Eugen Hoyos a75349d0c8 Fix standalone compilation of dsd planar decoders. 2014-05-03 08:53:57 +02:00
Carl Eugen Hoyos 4116cbeaf5 Fix oga muxer standalone compilation. 2014-05-03 08:51:27 +02:00
Michael Niedermayer 64e448994c avcodec/h263dec: print MB position for each MB when TRACE is enabled 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-05-02 22:47:11 +02:00
Michael Niedermayer 41a679000f avcodec/mpegvideo: fix gray*() parameter types 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-05-02 17:12:42 +02:00
Michael Niedermayer c60b266eac avcodec/mpegvideo: support disabling motion compensation 
This allows analyzing videos without having prior and current frames mixed

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-05-02 16:51:39 +02:00
Michael Niedermayer e881a96632 avcodec/libxvid: improve return codes 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-05-01 23:08:01 +02:00
Michael Niedermayer 2ff81d0916 avcodec/utils/ff_init_buffer_info factor avctx->internal->pkt; out 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-05-01 22:59:59 +02:00
Michael Niedermayer bbc604020f avcodec/utils: merge ff_decode_frame_props() and ff_init_buffer_info() 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-05-01 22:01:38 +02:00
Michael Niedermayer 77811482ab avcodec/utils: ff_decode_frame_props: set pkt_size 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-05-01 22:01:38 +02:00
Michael Niedermayer 58f4d1266b Merge commit 'ba71c74017c287681153ec8f6f1cba650d797275' 
* commit 'ba71c74017c287681153ec8f6f1cba650d797275':
  lavc: deprecate AVCodecContext.codec_name

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-05-01 18:04:53 +02:00
Michael Niedermayer e77b9853ea Merge commit 'a2941c8cb216bdc144953cace64973f5600ffa2d' 
* commit 'a2941c8cb216bdc144953cace64973f5600ffa2d':
  lavc: move CODEC_FLAG_MV0 to mpegvideo

Conflicts:
	libavcodec/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-05-01 17:03:59 +02:00
Michael Niedermayer e40ae8cc00 Merge commit '6484149158b6fc6d13d2b2ef84cb26a2d3275400' 
* commit '6484149158b6fc6d13d2b2ef84cb26a2d3275400':
  lavc: make the xvid-specific "gmc" flag a private option of libxvid

Conflicts:
	libavcodec/libxvid.c
	libavcodec/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-05-01 16:56:40 +02:00
Michael Niedermayer 1851643987 Merge commit 'b2c31710c96fa47d9dcd40b64d39663e8957f683' 
* commit 'b2c31710c96fa47d9dcd40b64d39663e8957f683':
  lavc: move CODEC_FLAG_NORMALIZE_AQP to mpegvideo

Conflicts:
	libavcodec/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-05-01 16:46:38 +02:00
Michael Niedermayer cac07d0e10 Merge commit '5fccedaa67390ccddd6347c8e1c71b7664558bcd' 
* commit '5fccedaa67390ccddd6347c8e1c71b7664558bcd':
  lavc: deprecate CODEC_FLAG_INPUT_PRESERVED

Conflicts:
	doc/APIchanges

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-05-01 16:41:41 +02:00
Luca Barbato a90d92ce2a aac: K&R formatting cosmetics 2014-05-01 13:00:57 +02:00
Luca Barbato c6b42e8549 flv: K&R formatting cosmetics 2014-05-01 13:00:57 +02:00
Anton Khirnov ba71c74017 lavc: deprecate AVCodecContext.codec_name 
It is undocumented and has no real use.
 2014-05-01 09:31:32 +02:00
Anton Khirnov e7fc9796d8 lavc: do not use AVCodecContext.codec_name in avcodec_string() 
That field will be deprecated.
 2014-05-01 09:26:57 +02:00
Anton Khirnov a2941c8cb2 lavc: move CODEC_FLAG_MV0 to mpegvideo 2014-05-01 09:24:18 +02:00