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
f4e814f787
swresample: check av_opt_set for failure in swr_alloc_set_opts()
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-08-11 01:34:34 +02:00
Luca Barbato
c4ac48c5a1
swresample: document the need to configure the context using AVOptions
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-08-11 00:35:56 +02:00
Michael Niedermayer
49456a95eb
avformat/movenc: Fix printf type
...
Found-by: Timothy Gu <timothygu99@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-08-11 00:09:09 +02:00
Michael Niedermayer
7727345613
Merge commit '08b94f160a2c966bb83e32bde0e52246fafa2155'
...
* commit '08b94f160a2c966bb83e32bde0e52246fafa2155':
configure: Don't pass MSVC compiler options -M[TD] to armasm
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-08-10 23:47:48 +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
Carl Eugen Hoyos
788cf6f0c6
Remove panscan information in av_frame_copy_props() if resolution changes.
...
Fixes ticket #3750 .
2014-08-10 22:31:33 +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
Mark Reid
cab39afb1a
avformat/movenc: check that reel_name length doesn't exceed UINT16_MAX
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-08-10 21:32:05 +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
Michael Niedermayer
d123d9abef
Merge commit '8dca0877e3e1457e9ec79ffa1ead1135aabb791c'
...
* commit '8dca0877e3e1457e9ec79ffa1ead1135aabb791c':
mpegts: Return proper error code on invalid input data
Conflicts:
libavformat/mpegtsenc.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-08-10 20:34:28 +02:00
Michael Niedermayer
c24be3c4a2
Merge commit '59cc0812207e3c2e2f2e559d60d0a8f9296a8847'
...
* commit '59cc0812207e3c2e2f2e559d60d0a8f9296a8847':
Prepare for 11_alpha2 Release
Conflicts:
RELEASE
Not merged, as our release numbers differ
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-08-10 20:32:00 +02:00
Michael Niedermayer
3787495e1f
Merge commit 'ab0742d2f34d70415620441b7ed7da2f03a0c14f'
...
* commit 'ab0742d2f34d70415620441b7ed7da2f03a0c14f':
configure: Suggest upgrading gas-preprocessor instead of just installing
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-08-10 20:31:14 +02:00
Martin Storsjö
08b94f160a
configure: Don't pass MSVC compiler options -M[TD] to armasm
...
The -MD option (for enabling a dynamically linked crt) gets interpreted
as a cpp option for generating dependency information (into a file named
'-.d', when preprocessing to a pipe). We shouldn't be passing
any and all C compiler flags to armasm (which is a plain assembler,
only with cpp bolted on via gas-preprocessor), but these are the
main conflicting ones.
Signed-off-by: Martin Storsjö <martin@martin.st>
2014-08-10 21:29:06 +03: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
7e4e45d227
Merge commit '9f8cf50e3be04b8e178086edaa4598826143303d'
...
* commit '9f8cf50e3be04b8e178086edaa4598826143303d':
configure: Enable gas-preprocessor on all OSes but only if available
Conflicts:
configure
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-08-10 19:16:42 +02:00
Michael Niedermayer
f51c3e3a84
Merge commit 'f4312352fc52cc47c1ba398a33f629d32a737e91'
...
* commit 'f4312352fc52cc47c1ba398a33f629d32a737e91':
configure: Add probe identification of MS armasm
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-08-10 18:54:15 +02:00
Michael Niedermayer
d6efed84b1
Merge remote-tracking branch 'cehoyos/master'
...
* cehoyos/master:
lavf/img2dec: Initialize a stack variable.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-08-10 18:48:07 +02: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
Michael Niedermayer
78eaaa857e
Merge commit 'fb1ddcdc8f51b9d261ae8e9c26b91e81f7b6bf45'
...
* commit 'fb1ddcdc8f51b9d261ae8e9c26b91e81f7b6bf45':
avresample: Introduce AVFrame-based API
Conflicts:
libavresample/utils.c
libavutil/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-08-10 18:20:37 +02:00
Carl Eugen Hoyos
273fc0139e
lavf/img2dec: Initialize a stack variable.
...
Fixes a valgrind warning about using unitialised memory.
Hopefully fixes crashes on several platforms reported through fate.
2014-08-10 18:20:12 +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
Nidhi Makhijani
8dca0877e3
mpegts: Return proper error code on invalid input data
...
Signed-off-by: Diego Biurrun <diego@biurrun.de>
2014-08-10 07:24:30 -07:00
Reinhard Tartler
59cc081220
Prepare for 11_alpha2 Release
2014-08-10 10:07:55 -04:00
Martin Storsjö
ab0742d2f3
configure: Suggest upgrading gas-preprocessor instead of just installing
...
Older versions don't support all the features we test for now.
Signed-off-by: Martin Storsjö <martin@martin.st>
2014-08-10 16:25:45 +03:00
Diego Biurrun
9f8cf50e3b
configure: Enable gas-preprocessor on all OSes but only if available
...
Signed-off-by: Martin Storsjö <martin@martin.st>
2014-08-10 16:25:45 +03:00
Martin Storsjö
f4312352fc
configure: Add probe identification of MS armasm
...
Signed-off-by: Martin Storsjö <martin@martin.st>
2014-08-10 16:25:45 +03: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
Luca Barbato
fb1ddcdc8f
avresample: Introduce AVFrame-based API
2014-08-10 14:26:37 +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
James Almer
6985ef7813
lavfi: stop exporting internal functions
...
Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-08-10 04:51:19 +02:00
James Almer
ddce2b2654
tools/fourcc2pixfmt: use avpriv_get_raw_pix_fmt_tags()
...
lavc doesn't export ff_raw_pix_fmt_tags[] anymore.
Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-08-10 04:50:31 +02:00
Michael Niedermayer
e18d9d90f1
Merge commit '8c6f430291374cf6d2cfb85cdbb809803b5a7d83'
...
* commit '8c6f430291374cf6d2cfb85cdbb809803b5a7d83':
mpeg: Suppress a compiler warning on callback type
Conflicts:
libavformat/mpegenc.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-08-10 02:20:54 +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
329832d779
Merge commit '24c788f4878729a42150581d7ed7e9a11daf874d'
...
* commit '24c788f4878729a42150581d7ed7e9a11daf874d':
Remove obsolete FF_API_REFERENCE_DTS cruft.
Conflicts:
libavformat/avformat.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-08-10 02:01:34 +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
c218d8218d
Merge commit '24e87f7f425a52b1e69661dcb2fbe0555a76f30b'
...
* commit '24e87f7f425a52b1e69661dcb2fbe0555a76f30b':
Remove obsolete FF_API_PROBE_MIME cruft.
Conflicts:
libavformat/avformat.h
libavformat/format.c
libavformat/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-08-10 01:36:21 +02:00
Michael Niedermayer
0f7ca2d778
Merge remote-tracking branch 'cigaes/master'
...
* cigaes/master:
lavf/avio: do not include bprint.h.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-08-10 01:34:05 +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
97f8c7a03e
bump libpostproc and libswresample
...
this is needed / avoids some headaches as one of their dependancies
(libavutil) was bumped
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-08-10 01:17:02 +02:00