generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
65,545 Commits 24 Branches 241 Tags 173 MiB
5195512add
Commit Graph

29551 Commits

Author SHA1 Message Date
Michael Niedermayer
5195512add Merge commit 'ed53cc217f6a6e4ddb35e3f01a79496091dc82dc' 
* commit 'ed53cc217f6a6e4ddb35e3f01a79496091dc82dc':
  hevc: derive partial merge list

Conflicts:
	libavcodec/hevc_mvs.c

See: 4576eff05d
Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-08-12 16:27:39 +02:00
Michael Niedermayer
e6ffe7bcfc Merge commit '09182b3224370e1d636631e77f201a8388766bd6' 
* commit '09182b3224370e1d636631e77f201a8388766bd6':
  hevc: simplify rounding

Conflicts:
	libavcodec/hevc_mvs.c

See: 2e471e4703
Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-08-12 16:07:07 +02:00
Michael Niedermayer
2278146a0c Merge commit 'd1b1c3bb5ef1bee409c06c3bcacfb8674e1cb574' 
* commit 'd1b1c3bb5ef1bee409c06c3bcacfb8674e1cb574':
  hevc: reorder loops

Conflicts:
	libavcodec/hevc.c

See: eca1957c4c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-08-12 15:59:33 +02:00
Ronald S. Bultje
45bed0ab30 vp9/x86: fix bug in intra_pred_hd_32x32. 
Fixes mismatch in first keyframe in sample
ffvp9_fails_where_libvpx.succeeds.webm from ticket 3849. There's still
a second mismatch a few frames into the sample.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-08-12 13:11:21 +02:00
James Almer
c97870d1a1 x86/dca: remove unused header 
Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-08-12 12:46:53 +02:00
James Almer
e20ff251a6 x86/ttadsp: remove an unnecessary mova 
Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-08-12 12:29:05 +02:00
Christophe Gisquet
ed53cc217f hevc: derive partial merge list 
The merge list only needs to be derived up to the merge index.

Signed-off-by: Anton Khirnov <anton@khirnov.net>
 2014-08-12 09:59:30 +00:00
Christophe Gisquet
3505b19652 hevc: derive partially amvp list 
When the candidate has been found, no need to derive others.

Signed-off-by: Anton Khirnov <anton@khirnov.net>
 2014-08-12 09:58:14 +00:00
Christophe Gisquet
09182b3224 hevc: simplify rounding 
Signed-off-by: Anton Khirnov <anton@khirnov.net>
 2014-08-12 09:57:25 +00:00
Christophe Gisquet
d1b1c3bb5e hevc: reorder loops 
iterate over memory in a more continuous order

Signed-off-by: Anton Khirnov <anton@khirnov.net>
 2014-08-12 09:57:05 +00:00
Christophe Gisquet
52b81ff463 proresenc_kostya: report buffer overflow 
If the allocated size, despite best efforts, is too small, exit
with the appropriate error.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-08-12 00:46:37 +02:00
Christophe Gisquet
bf10f09bcc proresenc_kostya: remove unneeded parameters 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-08-12 00:46:37 +02:00
Michael Niedermayer
9a162146ca avcodec/snow: fix null pointer dereference in cleanup after allocation failure 
Fixes: snowf.avi
Found-by: Piotr Bandurski <ami_stuff@o2.pl>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-08-11 15:37:15 +02:00
Michael Niedermayer
ba47d519e5 avcodec/huffyuvdec: fix overread checks 
Fixes: ffvhuff_f.avi
Found-by: Piotr Bandurski <ami_stuff@o2.pl>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-08-11 15:17:11 +02:00
Michael Niedermayer
11512d70fa avcodec/get_bits: add BITS_LEFT() for finding the bits left with an opened reader 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-08-11 15:15:54 +02:00
James Almer
59ecd4882d lavc/raw: remove obsolete ff_raw_pix_fmt_tags cruft 
Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-08-11 13:46:23 +02:00
James Almer
8f2634f970 lavc: stop exporting internal functions and tables 
Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-08-11 13:23:48 +02:00
Michael Niedermayer
9eda4e8bd7 avcodec/idctdsp: move add/put_pixels_clamped_c to header 
This allows sharing them with the xvid IDCT

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-08-11 13:08:46 +02:00
Christophe Gisquet
5ec85c9750 hevc: do generic validation of bitstream 
After finishing parsing VPS/SPS/PPS/slice header, check remaining bits,
and if an overconsumption occurred, report invalid data.

Liked-by: BBB
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-08-11 02:47:05 +02:00
Ronald S. Bultje
bfffce4d08 hevc: add missing comma in log message. 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-08-11 02:27:27 +02:00
Michael Niedermayer
6801eb0a09 avcodec/vc1dec: do not crash when flushing without an allocated frame 
Fixes Ticket3837
Found-by: Piotr Bandurski <ami_stuff@o2.pl>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-08-11 02:16:43 +02:00
Michael Niedermayer
d177f27517 Merge commit 'cc1d8c54c19dd14fb851e3e7a7793d6b3bd75e94' 
* commit 'cc1d8c54c19dd14fb851e3e7a7793d6b3bd75e94':
  avcodec: Postpone FF_IDCT_XVIDMMX removal until the next version bump

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-08-10 23:41:51 +02:00
Michael Niedermayer
3539d6c63a avcodec/iff: check pixfmt for rgb8 / rgbn 
Fixes out of array access

Found-by: Piotr Bandurski <ami_stuff@o2.pl>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-08-10 22:05:55 +02:00
Michael Niedermayer
9bcdb98839 avcodec/iff: Factorize av_pix_fmt_desc_get() out 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-08-10 21:53:39 +02:00
Michael Niedermayer
bd87965247 Merge commit 'd63443b9684fa7b3e086634f7b44b203b6d9221e' 
* commit 'd63443b9684fa7b3e086634f7b44b203b6d9221e':
  lavc: drop the av_fast_{re,m}alloc compatibility wrappers

Conflicts:
	libavcodec/utils.c

See: a973e01501
Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-08-10 20:51:15 +02:00
Diego Biurrun
cc1d8c54c1 avcodec: Postpone FF_IDCT_XVIDMMX removal until the next version bump 2014-08-10 10:41:55 -07:00
Michael Niedermayer
61b9ce00a3 Merge commit '2597a842a0a2c7e8aa76f32733d27bf64817ae86' 
* commit '2597a842a0a2c7e8aa76f32733d27bf64817ae86':
  tiff: Improve grayscale support

Conflicts:
	libavcodec/tiff.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-08-10 18:40:46 +02:00
Christophe Gisquet
0d0d24af01 hevc_ps: verify P/T/L information 
This makes the SPS parsing a little, but barely, safer.

Reviewed-by: Mickaël Raulet <mraulet@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-08-10 18:05:33 +02:00
Anton Khirnov
d63443b968 lavc: drop the av_fast_{re,m}alloc compatibility wrappers 
They were only needed until the bump.
 2014-08-10 15:40:38 +00:00
Michael Niedermayer
07262c7199 avcodec/options_table: leave xvidmmx AVOption in place 
Also mark it as deprecated through its help text

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-08-10 17:30:27 +02:00
Christophe Gisquet
84bc45880a hevc_mvs: set candidate availabilities 
They might be left uninitialized otherwise since 3ad04608.

Fixes ticket #3840.

Found-by: Carl Eugen Hoyos <ce@hoyos.ws>
Reported-by: Piotr Bandurski <ami_stuff@o2.pl>

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-08-10 17:13:18 +02:00
Derek Buitenhuis
43654a22c0 Revert "lavc/utils: Do not require dimensions for PNG." 
mplayer-specifc hacks should not be in our codebase. mplayer should fix
its own code. It is not our responsibility to work around their broken
code.

This reverts commit e8e575633f.

Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
 2014-08-10 15:58:13 +01:00
Diego Elio Pettenò
2597a842a0 tiff: Improve grayscale support 
Only use PAL8 if palette is present, else use GRAY8 for pixfmt.

Instead of simulating a grayscale palette, use real grayscale pixels, if no
palette is actually defined.

Signed-off-by: Diego Elio Pettenò <flameeyes@flameeyes.eu>
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
 2014-08-10 15:21:44 +02:00
Christophe Gisquet
7117547298 hevc: fix incorrect sao buffer size 
It previously used the output, cropped size, causing overreads/writes.

Fixes ticket #3839.

This issue was introduced by d249e682, which is not part of any release

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-08-10 12:34:57 +02:00
Michael Niedermayer
a71fcfad89 Merge commit '9325d88eba8038b3e2a4485e473a018410379e2d' 
* commit '9325d88eba8038b3e2a4485e473a018410379e2d':
  lavc: remove obsolete and disabled avpriv functions

Conflicts:
	libavcodec/dv_profile.c
	libavcodec/dv_profile.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-08-10 02:09:13 +02:00
Michael Niedermayer
a973e01501 avcodec: disable FF_API_FAST_MALLOC 
It causes build failures in some cases and the functions are provided by
libavutil so the wraper should not be needed anymore

Found-by: jamrial
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-08-10 01:53:10 +02:00
Michael Niedermayer
287602f9d8 Merge commit '472f9ed312ec784f7c72876b77163f4741880d05' 
* commit '472f9ed312ec784f7c72876b77163f4741880d05':
  Remove obsolete FF_API_AVFRAME_COLORSPACE cruft.

Conflicts:
	libavcodec/utils.c
	libavutil/frame.h
	libavutil/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-08-10 01:29:24 +02:00
Michael Niedermayer
65cb02e87a avcodec/version: delay removial of FF_API_AUDIO_CONVERT/FF_API_AVCODEC_RESAMPLE 
Some applications still use this deprecated API
Its not nice to remove it when its still in use and as long as it doesnt
cause us any work to keep it.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-08-10 00:38:48 +02:00
Michael Niedermayer
a57ece0cb4 Merge commit '1985c2e75c607ac51bfd8dc87d2957a5edf2b6f8' 
* commit '1985c2e75c607ac51bfd8dc87d2957a5edf2b6f8':
  Bump major versions of all libraries.

Conflicts:
	doc/APIchanges
	libavcodec/version.h
	libavdevice/version.h
	libavfilter/version.h
	libavformat/version.h
	libavutil/version.h
	libswscale/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-08-10 00:26:45 +02:00
Michael Niedermayer
80c1cb522c avcodec/version: leave old audio API 
If people prefer we can also drop it

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-08-10 00:21:56 +02:00
Michael Niedermayer
6fac482624 avcodec/flacdec: fix handling of av_samples_fill_arrays() return value 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-08-10 00:21:55 +02:00
Michael Niedermayer
70b8668fb5 drop LLS1, rename LLS2 to LLS 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-08-09 23:20:31 +02:00
Michael Niedermayer
c89afc9acf delay removial of FF_API_CODEC_ID, FF_API_OLD_AVOPTIONS and FF_API_OLD_ENCODE_VIDEO 
This prevents a build failure when bumping.
the uses could easily be updated / removed, if people prefer.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-08-09 23:19:16 +02:00
Michael Niedermayer
889cb3ae23 avcodec: remove deprecated use of FF_IDCT_XVIDMMX 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit eedc3f36532e4c6de782fe1c2dc59d192418a8fc)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-08-09 22:45:57 +02:00
Michael Niedermayer
3e41d2e612 Merge commit 'f4c444e17d137c786f0ed2da0e5943df505d5f9e' 
* commit 'f4c444e17d137c786f0ed2da0e5943df505d5f9e':
  Postpone API-incompatible changes until the next bump.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-08-09 22:19:45 +02:00
Michael Niedermayer
499ff6a052 Merge commit '7acdd3a1275bcd9cad48f9632169f6bbaeb39d84' 
* commit '7acdd3a1275bcd9cad48f9632169f6bbaeb39d84':
  hevc_filter: avoid excessive calls to ff_hevc_get_ref_list()

Conflicts:
	libavcodec/hevc_filter.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-08-09 21:49:55 +02:00
Michael Niedermayer
8d7c4cc082 Merge commit 'a7a17e3f1915ce69b787dc58c5d8dba0910fc0a4' 
* commit 'a7a17e3f1915ce69b787dc58c5d8dba0910fc0a4':
  hevc_filter: move some conditions out of loops

Conflicts:
	libavcodec/hevc_filter.c

This is possibly less readable than the variant used before.
Thus please take a look and if people agree its worse, dont
hesitate to revert.

See: 83976e40e8
Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-08-09 21:29:33 +02:00
Michael Niedermayer
3f2495d98c Merge commit '70211539a39ca3854f8a9e97d51dc27caa079943' 
* commit '70211539a39ca3854f8a9e97d51dc27caa079943':
  hevc: deobfuscate slice/tile boundary handling for DBF

Conflicts:
	libavcodec/hevc.c
	libavcodec/hevc_filter.c

See: a5c621aa85
Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-08-09 21:01:55 +02:00
Anton Khirnov
9325d88eba lavc: remove obsolete and disabled avpriv functions 2014-08-09 16:59:34 +00:00
Anton Khirnov
472f9ed312 Remove obsolete FF_API_AVFRAME_COLORSPACE cruft. 2014-08-09 16:59:13 +00:00