Carl Eugen Hoyos
34d48dac25
avcodec/pnmdec: support more pnm files
...
Fixes Ticket1897
Some hunks that have become unneeded due to previous changes removed by the commiter.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-08-03 15:00:20 +02:00
Michael Niedermayer
62738157dd
pnmdec: always output native pixel format
...
This simplifies the code
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-08-03 15:00:15 +02:00
Michael Niedermayer
82fdfe8e51
Merge commit 'a8b19271c3b40ac3c3dc769fe248887acf14ba5a'
...
* commit 'a8b19271c3b40ac3c3dc769fe248887acf14ba5a':
avcodec: Add output_picture_number to AVCodecParserContext
Conflicts:
doc/APIchanges
libavcodec/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-08-03 10:48:11 +02:00
Michael Niedermayer
1607a98545
avcodec/mlp: Fix bugs in libavs warning fixes
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-08-03 10:27:42 +02:00
Michael Niedermayer
20be5e0a0e
Merge commit '7950e519bb094897f957b9a9531cc60ba46cbc91'
...
* commit '7950e519bb094897f957b9a9531cc60ba46cbc91':
Disable deprecation warnings for cases where a replacement is available
Conflicts:
libavcodec/avpacket.c
libavcodec/pthread.c
libavcodec/utils.c
libavdevice/v4l2.c
libavfilter/avfiltergraph.c
libavfilter/buffersrc.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-08-03 10:08:30 +02:00
Michael Niedermayer
a8e963835a
Merge commit 'b5a138652ff8a5b987d3e1191e67fd9f6575527e'
...
* commit 'b5a138652ff8a5b987d3e1191e67fd9f6575527e':
Give less generic names to global library option arrays
Conflicts:
libavcodec/options_table.h
libavfilter/avfilter.c
libavformat/options_table.h
libswscale/options.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-08-03 09:16:36 +02:00
Michael Niedermayer
7cd13f618c
Merge commit '0d8b943d204bd16fcf2f4a59c742e65a401dd3d0'
...
* commit '0d8b943d204bd16fcf2f4a59c742e65a401dd3d0':
h264_sei: Return meaningful values
Conflicts:
libavcodec/h264_sei.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-08-03 08:54:54 +02:00
Michael Niedermayer
bdccfc3fc3
Merge remote-tracking branch 'cehoyos/master'
...
* cehoyos/master:
Forward interlaced field information from mov to ffv1 decoder.
Do not suggest to use gas-preprocessor if using it would break compilation.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-08-03 00:45:08 +02:00
Tim.Nicholson
ae4c912bce
Forward interlaced field information from mov to ffv1 decoder.
...
Only read the information for old ffv1, level/version 3 saves
the information in the bitstream.
Fixes a part of ticket #2190 .
Signed-off-by: Carl Eugen Hoyos <cehoyos@ag.or.at>
2013-08-02 23:31:40 +02:00
Michael Niedermayer
154c8bf60b
avcodec/mdec: make block_index static const
2013-08-02 23:12:26 +02:00
Michael Niedermayer
f19a23bd4f
avcodec/mjpeg: make 2 outcommented tables static
2013-08-02 23:11:58 +02:00
Michael Niedermayer
b984c727f5
avcodec/dxtory: make def_lru[8] static
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-08-02 23:11:31 +02:00
Michael Niedermayer
04c50cb3a0
avcodec/dnxhdenc: make header_prefix static const
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-08-02 23:10:42 +02:00
Yusuke Nakamura
a8b19271c3
avcodec: Add output_picture_number to AVCodecParserContext
...
Set output_picture_number in H.264 parser.
Signed-off-by: Diego Biurrun <diego@biurrun.de>
2013-08-02 20:59:45 +02:00
Diego Biurrun
7950e519bb
Disable deprecation warnings for cases where a replacement is available
2013-08-02 19:19:02 +02:00
Diego Biurrun
b5a138652f
Give less generic names to global library option arrays
2013-08-02 19:19:02 +02:00
Paul B Mahol
bc2187cfdb
ttaenc: fix packet size
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-08-02 16:45:58 +00:00
Vittorio Giovara
0d8b943d20
h264_sei: Return meaningful values
...
Signed-off-by: Diego Biurrun <diego@biurrun.de>
2013-08-02 18:19:40 +02:00
Michael Niedermayer
2ae5ac78d8
Merge remote-tracking branch 'qatar/master'
...
* qatar/master:
h264_sei: K&R formatting cosmetics
Conflicts:
libavcodec/h264_sei.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-08-02 12:37:37 +02:00
Michael Niedermayer
da4cd61502
Merge commit '4c7fd58f8ae729b964b6859eace5ab9a55ce3c8c'
...
* commit '4c7fd58f8ae729b964b6859eace5ab9a55ce3c8c':
h264_sei: Remove pointless old comment
twinvq: Add proper twinvq prefixes to identifiers
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-08-02 12:23:52 +02:00
Michael Niedermayer
bff371e34c
jpeg2000dec: simplify jpeg2000_read_bitstream_packets()
...
23 lines less
less error prone as theres no more need to update *_size on every read
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-08-02 03:55:07 +02:00
Michael Niedermayer
5936d98244
avcodec/wmaenc: change commented assert to av_assert
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-08-02 03:54:59 +02:00
Timothy Gu
b3f858b829
libxvid: cosmetics: Realign the code
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-08-02 03:21:09 +02:00
Vittorio Giovara
b18412171f
h264_sei: K&R formatting cosmetics
...
Signed-off-by: Diego Biurrun <diego@biurrun.de>
2013-08-01 13:26:07 +02:00
Diego Biurrun
4c7fd58f8a
h264_sei: Remove pointless old comment
2013-08-01 13:26:07 +02:00
Diego Biurrun
9ea24e927e
twinvq: Add proper twinvq prefixes to identifiers
2013-08-01 12:44:05 +02:00
Paul B Mahol
69fe25cdca
lclenc: remove unused code
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-07-31 20:01:43 +00:00
Paul B Mahol
fe37551249
sunrastenc: do not set avctx->coded_frame
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-07-31 20:01:43 +00:00
Paul B Mahol
678431d3f2
jv: make code independent of sizeof(AVFrame)
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-07-31 20:01:42 +00:00
Paul B Mahol
ff1c13b133
mss3: make code independent of sizeof(AVFrame)
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-07-31 20:01:42 +00:00
Paul B Mahol
02fe531afe
mss2: make code independent of sizeof(AVFrame)
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-07-31 20:01:42 +00:00
Paul B Mahol
451b2ca1b4
indeo2: make code independent of sizeof(AVFrame)
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-07-31 20:01:42 +00:00
Paul B Mahol
76e27b1d05
smacker: make code independent of sizeof(AVFrame)
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-07-31 20:01:42 +00:00
Timothy Gu
3b3c1ed076
libxvid: Add SSIM displaying through a libxvidcore plugin
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-07-31 12:41:27 +02:00
Timothy Gu
ccb212b6c3
libxvid: add working lumimasking and variance AQ
...
The old implementation is unusable due to change in the Xvid API.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-07-31 11:57:52 +02:00
Romain Beauxis
38536e5927
Support for shine 3.0.0
2013-07-30 21:12:34 +00:00
Michael Niedermayer
121fc05b4d
avcodec/get_bits: place volatile at the right spot
...
Should fix Ticket2825
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-07-30 20:55:54 +02:00
Michael Niedermayer
43411f416f
avcodec/get_bits: init_state is used for thread sync, make it volatile
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-07-30 20:38:19 +02:00
Michael Niedermayer
000f8bcd03
Merge remote-tracking branch 'qatar/master'
...
* qatar/master:
Replace remaining obsolete PIX_FMT names with AV_PIX_FMT equivalents
Conflicts:
libavcodec/g2meet.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-07-30 12:03:12 +02:00
Michael Niedermayer
947f2d4d34
Merge commit '55c4cba2a7037161ea56b2d55b347c8381df7f1e'
...
* commit '55c4cba2a7037161ea56b2d55b347c8381df7f1e':
huffyuvenc: BGRA support
Conflicts:
libavcodec/huffyuvenc.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-07-30 09:50:26 +02:00
Diego Biurrun
78b4bfdb84
Replace remaining obsolete PIX_FMT names with AV_PIX_FMT equivalents
2013-07-29 23:46:51 +02:00
Michael Niedermayer
3cd8aaa2b2
avcodec/kmvc: fix MV checks
...
Fixes Ticket2813
Fixes regression since 70b5583
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-07-29 20:58:20 +02:00
Michael Niedermayer
55c4cba2a7
huffyuvenc: BGRA support
...
Bug-Id: 452
Signed-off-by: Diego Biurrun <diego@biurrun.de>
2013-07-29 18:21:05 +02:00
Carl Eugen Hoyos
f2118d44c9
Fix compilation with --disable-everything --enable-shared.
...
Compilation with --disable-everything --enable-shared failed
on systems with VAAPI support with the following undefined
symbol in libavcodec/vaapi.o:
libavcodec/libavcodec.so: undefined reference to `ff_mpeg_draw_horiz_band'
2013-07-29 17:52:40 +02:00
Michael Niedermayer
f80ccf074a
avcodec/ff_init_vlc_sparse: use a local array for static vlcs avoiding malloc()
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-07-29 16:48:41 +02:00
Michael Niedermayer
6af8326354
avcodec/ff_init_vlc_sparse: use a spinlock for thread sync
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-07-29 16:48:41 +02:00
Michael Niedermayer
a9903f7ec1
Revert "bitstream: make vlc init of static tables thread safe."
...
This reverts commit 4b6869d6e0
.
Conflicts:
libavcodec/bitstream.c
This code can cause assertion failures on artificial OOM situations
It will be replaced by a solution that doesnt have this issue in the
following commits.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-07-29 16:48:41 +02:00
Paul B Mahol
2786ac777d
zmbv: use av_image_copy_plane()
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-07-29 14:45:02 +00:00
Michael Niedermayer
6561aae8a9
Merge commit '3ca1dd2502a860989ee5289316af6b9816cee78f'
...
* commit '3ca1dd2502a860989ee5289316af6b9816cee78f':
xl: Make sure the width is valid
Conflicts:
libavcodec/xl.c
See: 94b42da696
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-07-29 12:09:38 +02:00
Michael Niedermayer
0c6f382e85
Merge commit '62b1e3b1031e901105d78e831120de8e4c3e0013'
...
* commit '62b1e3b1031e901105d78e831120de8e4c3e0013':
aasc: Check minimum buffer size
Conflicts:
libavcodec/aasc.c
See: e1631f8ebe
See: 8a57ca5c6a
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-07-29 11:46:28 +02:00
Michael Niedermayer
5f312139df
Merge commit '45ee556d51ef04d79d52bf6b0b7f28a4d231cb0c'
...
* commit '45ee556d51ef04d79d52bf6b0b7f28a4d231cb0c':
qdm2: Whitespace cosmetics
flac: use meaningful return values
Conflicts:
libavcodec/flacdec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-07-29 11:34:07 +02:00
Michael Niedermayer
688331c51c
Merge commit 'e13a929314e4a9a09d3146648f876f162f46cc32'
...
* commit 'e13a929314e4a9a09d3146648f876f162f46cc32':
xl: K&R formatting cosmetics
Conflicts:
libavcodec/xl.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-07-29 11:08:02 +02:00
Paul B Mahol
19da86f3ff
targaenc: remove unused TargaContext
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-07-28 22:42:40 +00:00
Paul B Mahol
e999f2339a
truemotion2: make code independent of sizeof(AVFrame)
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-07-28 22:42:40 +00:00
Paul B Mahol
a5155294e5
pnm: do not set avctx->coded_frame
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-07-28 22:27:36 +00:00
Paul B Mahol
329221eee7
pnm: fix 255 < maxval < 65535 for pam with depth 1
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-07-28 22:27:36 +00:00
Carl Eugen Hoyos
2c046c718a
Revert "Avoid overflows when reading pgm files with maxval != 255 and != 65535."
...
The patch worked on little endian because pgm decoding was broken
but it was not correct in any way.
This reverts commit 7651c0e49b
.
2013-07-29 00:05:43 +02:00
Paul B Mahol
768e40b451
Revert "pnm: remove nonsense code"
...
Breaks decoding pgms with 256 < maxval < 65535.
Found-by: Carl Eugen Hoyos <cehoyos@ag.or.at>.
This reverts commit a0348d0966
.
2013-07-28 21:45:37 +00:00
Luca Barbato
3ca1dd2502
xl: Make sure the width is valid
...
And undo the wrong commit f1cb490d6d
CC: libav-stable@libav.org
2013-07-28 19:36:44 +02:00
Carl Eugen Hoyos
7651c0e49b
Avoid overflows when reading pgm files with maxval != 255 and != 65535.
...
libjpeg v6b apparently does not initialize the most significant bits
to zero when writing 12bit pgm's with maxval 4095.
2013-07-28 19:07:06 +02:00
Carl Eugen Hoyos
7e8e8ba9cc
Assume gray8 if 1 < maxval <= 255 in pgm.
2013-07-28 18:12:23 +02:00
Carl Eugen Hoyos
ae4dc0b37a
Set bits_per_raw_sample when decoding mjpeg / ljpeg.
...
The ljpeg decoder also supports gray images with
8 - 15 bits per component.
2013-07-28 17:13:01 +02:00
Paul B Mahol
b09d86c636
utvideoenc: use av_image_copy_plane()
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
2013-07-28 10:57:51 -04:00
Luca Barbato
62b1e3b103
aasc: Check minimum buffer size
...
Prevent some overreads.
Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
2013-07-28 15:41:59 +02:00
Luca Barbato
45ee556d51
qdm2: Whitespace cosmetics
2013-07-28 14:58:19 +02:00
Luca Barbato
0e78ef0f94
flac: use meaningful return values
2013-07-28 14:58:18 +02:00
Michael Niedermayer
b0edd59994
Merge commit 'bf4b0ed1d5d323050a87c9f0ad1dd40860eb3da2'
...
* commit 'bf4b0ed1d5d323050a87c9f0ad1dd40860eb3da2':
Add missing deprecation attributes
Conflicts:
libavfilter/avfilter.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-07-28 13:44:34 +02:00
Luca Barbato
e13a929314
xl: K&R formatting cosmetics
2013-07-28 12:45:05 +02:00
Luca Barbato
f1cb490d6d
xl: Fix the buffer size check
...
Also make it the first check.
Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
2013-07-28 12:45:05 +02:00
Michael Niedermayer
102397d2c1
Merge commit '16c22122c788b5e54a2f2e224bd0106429f0714c'
...
* commit '16c22122c788b5e54a2f2e224bd0106429f0714c':
h264: K&R formatting cosmetics
Conflicts:
libavcodec/h264.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-07-28 11:40:49 +02:00
Marton Balint
63c0113588
lavc: do not override format if neither text nor bitmap codec prop is set
...
Some decoders may output both, this way the decoder can set it.
Signed-off-by: Marton Balint <cus@passwd.hu>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-07-27 23:03:00 +02:00
Paul B Mahol
94ad38e2e8
dpx: use av_image_copy_plane()
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-07-27 20:51:14 +00:00
Paul B Mahol
6a57494204
dpxenc: cosmetics: reindent
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-07-27 20:45:48 +00:00
Paul B Mahol
9d099b9ae4
targa_y216dec: remove empty function
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-07-27 20:27:15 +00:00
Paul B Mahol
0909f3edbd
zmbv: return meaningful error code
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-07-27 20:21:33 +00:00
Paul B Mahol
60a7fac61b
utvideoenc: use av_image_copy_plane()
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-07-27 20:07:48 +00:00
Tim.Nicholson
84e345b38e
Forward interlaced field information from mov to v210 decoder.
...
Reported and tested by Dave Rice.
Signed-off-by: Carl Eugen Hoyos <cehoyos@ag.or.at>
2013-07-27 18:57:28 +02:00
Diego Biurrun
bf4b0ed1d5
Add missing deprecation attributes
2013-07-27 16:08:49 +02:00
Michael Niedermayer
3adf054b22
avcodec/vorbisenc: change 6 asserts to av_asserts()
...
speed relevant ones use av_assert2()
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-07-27 15:23:13 +02:00
Michael Niedermayer
5e763920a4
avcodec/mpegvideo: update disabled assert() to av_assert0()
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-07-27 15:23:13 +02:00
Paul B Mahol
88b071a473
exr: set pict_type
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-07-27 12:02:19 +00:00
Paul B Mahol
d9954ccff0
targa: set pict_type
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-07-27 12:02:18 +00:00
Paul B Mahol
3ea5d01a12
escape130: make "chroma_vals" static
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-07-27 12:02:18 +00:00
Paul B Mahol
6dbcecd78e
lclenc: allocate FF_INPUT_BUFFER_PADDING_SIZE for extradata
...
Also check return value.
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-07-27 12:02:18 +00:00
Paul B Mahol
573018c61f
lclenc: cosmetics: reindent
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-07-27 12:00:25 +00:00
Paul B Mahol
86e722ab97
sgidec: safer check for buffer overflow
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-07-27 12:00:25 +00:00
Paul B Mahol
997e2b59e3
sgidec: return meaningful error codes
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-07-27 12:00:25 +00:00
Paul B Mahol
5efa5103b0
sgidec: simplify return path
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-07-27 12:00:25 +00:00
Diego Biurrun
16c22122c7
h264: K&R formatting cosmetics
2013-07-27 10:47:38 +02:00
Michael Niedermayer
205f423e28
libavcodec/mpegvideo: change some asserts to av_assert0()
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-07-26 22:29:55 +02:00
Michael Niedermayer
c88bbc01eb
avcodec/mpegvideo: replace assert about interlaced EC by debug av_log()
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-07-26 22:29:47 +02:00
Paul B Mahol
1fa0284c57
qcelpdec: change asserts to av_asserts
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-07-26 18:32:27 +00:00
Paul B Mahol
fdf9296df7
sgienc: remove unused SgiContext
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-07-26 18:21:44 +00:00
Paul B Mahol
2868035d95
pcxenc: get rid of unused PCXContext
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-07-26 14:00:40 +00:00
Paul B Mahol
3838637bbb
yop: check return value of av_frame_alloc()
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-07-26 13:51:26 +00:00
Paul B Mahol
9437259276
vmnc: check return values of reallocation
...
Also avoid memory leaks.
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-07-26 13:49:36 +00:00
Paul B Mahol
cf5ab8b6f7
vmnc: make code independent of sizeof(AVFrame)
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-07-26 13:39:40 +00:00
Michael Niedermayer
46ad2d9e44
Merge remote-tracking branch 'qatar/master'
...
* qatar/master:
miscellaneous typo fixes
Conflicts:
configure
libavformat/avisynth.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-07-26 11:12:11 +02:00
Michael Niedermayer
5dc2c99055
Merge commit '93a51984a27f3ba84d4e6f13d0c704ee9891603e'
...
* commit '93a51984a27f3ba84d4e6f13d0c704ee9891603e':
mpeg12: Ignore slice threading if hwaccel is active
Conflicts:
libavcodec/mpeg12dec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-07-26 10:57:51 +02:00
Michael Niedermayer
bbc7d33a0d
Merge commit '582963a8156522582e55466be4a59974a8d909a5'
...
* commit '582963a8156522582e55466be4a59974a8d909a5':
vdpau: Fix VC-1 interlaced mode
Conflicts:
libavcodec/vdpau_vc1.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-07-26 10:51:42 +02:00
Michael Niedermayer
af7949fdea
Merge commit '4a2ef39442bf7f0150db07a1fbfcf8286e4d44a3'
...
* commit '4a2ef39442bf7f0150db07a1fbfcf8286e4d44a3':
cosmetics: Add '0' to float constants ending in '.'.
Conflicts:
libavcodec/ra288.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-07-26 10:43:12 +02:00
Michael Niedermayer
e28fabb4cb
Merge commit '6c145ecf785dc3d26ba3fed3ea9892cc80244625'
...
* commit '6c145ecf785dc3d26ba3fed3ea9892cc80244625':
twinvq: K&R formatting cosmetics
Conflicts:
libavcodec/twinvq.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-07-26 10:30:47 +02:00
Diego Biurrun
03039f4c8c
miscellaneous typo fixes
2013-07-25 19:43:32 +02:00
Rémi Denis-Courmont
93a51984a2
mpeg12: Ignore slice threading if hwaccel is active
...
Slice threading does not work with hardware acceleration, as decoding
is per-picture. This fixes Bugzilla #542 .
Signed-off-by: Diego Biurrun <diego@biurrun.de>
2013-07-25 19:43:32 +02:00
Carl Eugen Hoyos
9375879d57
Show max bitrate for mpeg2 video streams in avcodec_string().
...
See also 25b7aa9
2013-07-25 19:08:19 +02:00
Rainer Hochecker
582963a815
vdpau: Fix VC-1 interlaced mode
...
VDPAU expects the bitstream value (0, 2 or 3).
libavcodec uses an enum (0, 1 or 2).
Signed-off-by: Rémi Denis-Courmont <remi@remlab.net>
Signed-off-by: Diego Biurrun <diego@biurrun.de>
2013-07-25 14:19:17 +02:00
Diego Biurrun
4a2ef39442
cosmetics: Add '0' to float constants ending in '.'.
2013-07-25 11:33:23 +02:00
Diego Biurrun
6c145ecf78
twinvq: K&R formatting cosmetics
2013-07-25 11:17:06 +02:00
Michael Niedermayer
0815b23062
Merge remote-tracking branch 'qatar/master'
...
* qatar/master:
arm: Comment out unused labels in simple_idct_arm
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-07-25 10:15:08 +02:00
Michael Niedermayer
6db57fa8bc
avcodec/mjpegdec: Support RGBA lpegs
...
Fixes Ticket896
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-07-25 00:32:44 +02:00
Martin Storsjö
54ba52077c
arm: Comment out unused labels in simple_idct_arm
...
When building for iOS in thumb mode, gas-preprocessor.pl doesn't
mark unused labels as thumb functions (as it does for other
local labels, where it can figure out that they are functions
due to being referenced in branch instructions). This leads to
linker warnings for some of those local labels, such as:
ld: warning: ARM function not 4-byte aligned: __a_evaluation from
libavcodec/libavcodec.a(simple_idct_arm.o)
Therefore, comment them out since they don't have any function.
They do still have a value in documenting key points in the
assembly source though.
Signed-off-by: Martin Storsjö <martin@martin.st>
2013-07-24 22:43:21 +03:00
Michael Niedermayer
101c7ea906
avcodec/mpeg12dec: remove commented out assert
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-07-24 13:00:04 +02:00
Michael Niedermayer
800637709c
alsdec: minor simplification in read_block()
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-07-24 12:36:52 +02:00
Michael Niedermayer
7dec8512be
Merge remote-tracking branch 'qatar/master'
...
* qatar/master:
8bps: Make the bound-checks consistent
Conflicts:
libavcodec/8bps.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-07-24 12:01:29 +02:00
Michael Niedermayer
da0f67b177
Merge commit 'bd7b4da0f4627bb6c4a7c2575da83fe6b261a21c'
...
* commit 'bd7b4da0f4627bb6c4a7c2575da83fe6b261a21c':
8bps: Bound-check the input buffer
Conflicts:
libavcodec/8bps.c
See: 66ff90f4a3
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-07-24 11:45:54 +02:00
Michael Niedermayer
82654172ce
Merge commit '2f034f255c49050e894ab9b88087c09ebe249f3f'
...
* commit '2f034f255c49050e894ab9b88087c09ebe249f3f':
4xm: Reject not a multiple of 16 dimension
The newly added checks are redundant and thus replaced by asserts
See: db5b487551
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-07-24 11:31:14 +02:00
Michael Niedermayer
a550926705
Merge commit 'ca488ad480360dfafcb5766f7bfbb567a0638979'
...
* commit 'ca488ad480360dfafcb5766f7bfbb567a0638979':
alsdec: Clean up error paths
Conflicts:
libavcodec/alsdec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-07-24 10:31:10 +02:00
Michael Niedermayer
865f34823c
Merge commit '70ecc175c7b513a153ac87d1c5d219556ca55070'
...
* commit '70ecc175c7b513a153ac87d1c5d219556ca55070':
alsdec: Fix the clipping range
Conflicts:
libavcodec/alsdec.c
See: feaff427c0
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-07-24 10:15:50 +02:00
Michael Niedermayer
274a50ab57
avcodec/utils: Warn the user about the lack of a lock manager if insufficient locks are detected
...
A lock manager is not the only possibility to avoid open/close locking
issues but its easier and more robust than maintaining a lot of lock/unlock
calls.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-07-24 01:11:09 +02:00
Luca Barbato
6fd221e5f8
8bps: Make the bound-checks consistent
2013-07-23 23:03:37 +02:00
Luca Barbato
bd7b4da0f4
8bps: Bound-check the input buffer
...
Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
2013-07-23 23:03:37 +02:00
Luca Barbato
2f034f255c
4xm: Reject not a multiple of 16 dimension
...
Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
2013-07-23 23:03:37 +02:00
Luca Barbato
ca488ad480
alsdec: Clean up error paths
...
Fix at least a memory leak.
CC: libav-stable@libav.org
2013-07-23 23:03:37 +02:00
Luca Barbato
70ecc175c7
alsdec: Fix the clipping range
...
mcc_weightings is only 32 elements.
Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
2013-07-23 23:03:37 +02:00
Michael Niedermayer
55db06af64
avcodec/utils: use av_assert0() to check validity of input pointers for start code search
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-07-23 21:23:09 +02:00
Michael Niedermayer
abc8110f7e
avcodec: add avcodec_chroma_pos_to_enum()
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-07-23 03:11:28 +02:00
Michael Niedermayer
b7397857e2
avcodec: add avcodec_enum_to_chroma_pos()
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-07-23 03:07:30 +02:00
clook
4443213d2e
avcodec/libopenjpegen: XYZ 12 bit support for libopenjpeg encoder
2013-07-23 01:02:41 +02:00
Martin Storsjö
69e6702c01
arm: Mangle external symbols properly in new vfp assembly files
...
Signed-off-by: Martin Storsjö <martin@martin.st>
2013-07-22 14:48:30 +03:00
Martin Storsjö
47d57f24e3
arm: Mangle external symbols properly in new vfp assembly files
...
Reviewed-by: Kostya Shishkov
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-07-22 13:16:21 +02:00
Michael Niedermayer
23f250d2bc
Merge remote-tracking branch 'qatar/master'
...
* qatar/master:
arm: Add VFP-accelerated version of qmf_32_subbands
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-07-22 12:11:23 +02:00
Michael Niedermayer
366e415836
Merge commit '800ffab48a7844dd5dc0a33b8f6b8e5ed718cf2e'
...
* commit '800ffab48a7844dd5dc0a33b8f6b8e5ed718cf2e':
dcadsp: Add a new method, qmf_32_subbands
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-07-22 12:10:59 +02:00
Michael Niedermayer
c30eb74d18
Merge commit '8b9eba664edaddf9a304d3acbf0388b5c520781d'
...
* commit '8b9eba664edaddf9a304d3acbf0388b5c520781d':
arm: Add VFP-accelerated version of fft16
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-07-22 12:05:39 +02:00
Michael Niedermayer
bacba8e5d1
Merge commit 'ba6836c966debc56314ce2ef133c7f0c1fdfdeac'
...
* commit 'ba6836c966debc56314ce2ef133c7f0c1fdfdeac':
arm: Add VFP-accelerated version of dca_lfe_fir
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-07-22 12:04:28 +02:00
Michael Niedermayer
2305a6775d
Merge commit 'b63bb251ea6d6ba23295294e37a92625c0192206'
...
* commit 'b63bb251ea6d6ba23295294e37a92625c0192206':
arm: Add VFP-accelerated version of imdct_half
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-07-22 11:57:05 +02:00
Michael Niedermayer
3cab228005
Merge commit 'd6e4f5fef0d811e180fd7541941e07dca9e11dc0'
...
* commit 'd6e4f5fef0d811e180fd7541941e07dca9e11dc0':
arm: Add VFP-accelerated version of int32_to_float_fmul_array8
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-07-22 11:55:40 +02:00
Michael Niedermayer
1573274b91
Merge commit '26ffcc7de1d98f77400a2ebe4e75055515c54587'
...
* commit '26ffcc7de1d98f77400a2ebe4e75055515c54587':
dcadec: Use int32_to_float_fmul_array8
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-07-22 11:48:43 +02:00
Michael Niedermayer
0d3400ec53
Merge commit '31c6f6f65c0ed5a894e26ce44ab0c3e89c82b9a2'
...
* commit '31c6f6f65c0ed5a894e26ce44ab0c3e89c82b9a2':
fmtconvert: Add a new method, int32_to_float_fmul_array8
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-07-22 11:48:06 +02:00
Michael Niedermayer
877bbe05ce
Merge commit 'ce9ed10ac27b9cf32a6257e083ea2f052692d971'
...
* commit 'ce9ed10ac27b9cf32a6257e083ea2f052692d971':
arm: Add VFP-accelerated version of int32_to_float_fmul_scalar
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-07-22 11:42:19 +02:00
Michael Niedermayer
0129026c4e
Merge commit '41ef1d360bac65032aa32f6b43ae137666507ae5'
...
* commit '41ef1d360bac65032aa32f6b43ae137666507ae5':
arm: Add VFP-accelerated version of synth_filter_float
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-07-22 11:41:37 +02:00
Michael Niedermayer
b909428dab
Merge commit '4719040cd1b54381796b22056a9ae37bd2b4668d'
...
* commit '4719040cd1b54381796b22056a9ae37bd2b4668d':
libx264: Define X264_API_IMPORTS on MSVC/ICL
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-07-22 10:23:46 +02:00
Ben Avison
ff30d12159
arm: Add VFP-accelerated version of qmf_32_subbands
...
Before After
Mean StdDev Mean StdDev Change
This function 1323.0 98.0 746.2 60.6 +77.3%
Overall 15400.0 336.4 14147.5 288.4 +8.9%
Signed-off-by: Martin Storsjö <martin@martin.st>
2013-07-22 10:15:44 +03:00
Ben Avison
800ffab48a
dcadsp: Add a new method, qmf_32_subbands
...
This does most of the work formerly carried out by
the static function qmf_32_subbands() in dcadec.c.
Signed-off-by: Martin Storsjö <martin@martin.st>
2013-07-22 10:15:42 +03:00
Martin Storsjö
8b9eba664e
arm: Add VFP-accelerated version of fft16
...
Before After
Mean StdDev Mean StdDev Change
This function 1389.3 4.2 967.8 35.1 +43.6%
Overall 15577.5 83.2 15400.0 336.4 +1.2%
Signed-off-by: Martin Storsjö <martin@martin.st>
2013-07-22 10:15:41 +03:00
Martin Storsjö
ba6836c966
arm: Add VFP-accelerated version of dca_lfe_fir
...
Before After
Mean StdDev Mean StdDev Change
This function 868.2 33.5 436.0 27.0 +99.1%
Overall 15973.0 223.2 15577.5 83.2 +2.5%
Signed-off-by: Martin Storsjö <martin@martin.st>
2013-07-22 10:15:39 +03:00
Martin Storsjö
b63bb251ea
arm: Add VFP-accelerated version of imdct_half
...
Before After
Mean StdDev Mean StdDev Change
This function 2653.0 28.5 1108.8 51.4 +139.3%
Overall 17049.5 408.2 15973.0 223.2 +6.7%
Signed-off-by: Martin Storsjö <martin@martin.st>
2013-07-22 10:15:37 +03:00
Ben Avison
d6e4f5fef0
arm: Add VFP-accelerated version of int32_to_float_fmul_array8
...
Before After
Mean StdDev Mean StdDev Change
This function 366.2 18.3 277.8 13.7 +31.9%
Overall 18420.5 489.1 17049.5 408.2 +8.0%
Signed-off-by: Martin Storsjö <martin@martin.st>
2013-07-22 10:15:36 +03:00
Ben Avison
26ffcc7de1
dcadec: Use int32_to_float_fmul_array8
...
Signed-off-by: Martin Storsjö <martin@martin.st>
2013-07-22 10:15:35 +03:00
Ben Avison
31c6f6f65c
fmtconvert: Add a new method, int32_to_float_fmul_array8
...
This is similar to int32_to_float_fmul_scalar, but
loads a new scalar multiplier every 8 input samples.
This enables the use of much larger input arrays, which
is important for pipelining on some CPUs (such as
ARMv6).
Signed-off-by: Martin Storsjö <martin@martin.st>
2013-07-22 10:15:33 +03:00
Ben Avison
ce9ed10ac2
arm: Add VFP-accelerated version of int32_to_float_fmul_scalar
...
Before After
Mean StdDev Mean StdDev Change
This function 1175.0 4.4 366.2 18.3 +220.8%
Overall 19285.5 292.0 18420.5 489.1 +4.7%
Signed-off-by: Martin Storsjö <martin@martin.st>
2013-07-22 10:15:30 +03:00
Ben Avison
41ef1d360b
arm: Add VFP-accelerated version of synth_filter_float
...
Before After
Mean StdDev Mean StdDev Change
This function 9295.0 114.9 4853.2 83.5 +91.5%
Overall 23699.8 397.6 19285.5 292.0 +22.9%
Signed-off-by: Martin Storsjö <martin@martin.st>
2013-07-22 10:15:17 +03:00
Michael Niedermayer
682e8a694f
avcodec/h264_sei: Try to make code more robust by jumping to the specified SEI ends
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-07-22 02:48:13 +02:00
Justin Ruggles
8000206abc
libspeexdec: fix detection of final terminator code
2013-07-21 16:36:31 -04:00
Michael Niedermayer
118a1c2f4c
avcodec/ff_h264_decode_sei: use skip_bits_long()
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-07-21 17:57:15 +02:00
Michael Niedermayer
45da7a0e8f
avcodec/ff_h264_decode_sei: Check SEI size
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-07-21 17:57:15 +02:00
Michael Niedermayer
80c873a87e
avcodec/ff_h264_decode_sei: fix integer overflow with size.
...
This issue is hypothetical and no testcase is available.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-07-21 17:57:15 +02:00
Michael Niedermayer
800ffa1fc0
avcodec/h264_sei/ff_h264_decode_sei: fix error codes for insufficient data
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-07-21 17:57:15 +02:00
Joakim Plate
8710a634a5
h264: add frame packing as stereo_mode frame metadata
...
This matches the matroska defintion of stereo_mode, with
no metadata written if no info exist in sei
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-07-21 16:04:02 +02:00
Derek Buitenhuis
4719040cd1
libx264: Define X264_API_IMPORTS on MSVC/ICL
...
libx264 has a few data exports which require X264_API_IMPORTS
to be defined if we link to libx264 dynamically on Windows.
In a similar fashion to how we handle our compat snprintf
implementation, if we define it all the time, the compiler
will first try and link to __imp_x264_symbol_name, and failing
that, as in the case of a static libx264, will attempt to link
to the non-prefixed symbol, which has already been pulled in by
other x264 functions' object files.
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
2013-07-21 08:56:25 -04:00
Michael Niedermayer
0a28a52d53
Merge commit 'dd0bfc3a6a310e3e3674ce7742672d689a9a0e93'
...
* commit 'dd0bfc3a6a310e3e3674ce7742672d689a9a0e93':
dsicinav: Bound-check the source buffer when needed
Conflicts:
libavcodec/dsicinav.c
See: 47f0beadba
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-07-21 11:59:16 +02:00
Michael Niedermayer
75fbe41fc6
Merge commit 'fcae3ff124ee97c9265e3b93f3d41238b2aee9bd'
...
* commit 'fcae3ff124ee97c9265e3b93f3d41238b2aee9bd':
dsicinav: K&R formatting cosmetics
Conflicts:
libavcodec/dsicinav.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-07-21 11:45:48 +02:00
Michael Niedermayer
953c7550f8
avcodec/snowenc: convert speed relevant asserts to av_assert2()
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-07-21 04:40:12 +02:00
Michael Niedermayer
7b79c84b40
avcodec/snowdec: remove assert.h include, its unused
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-07-21 04:36:32 +02:00
Michael Niedermayer
1434df3b93
jpeg2000dec: Support non subsampled 9-16bit planar pixel formats
...
This applies changes similar to fc6de70c44
to the >8bit codepath
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-07-21 04:16:53 +02:00
Luca Barbato
fd81899321
dsicinav: Clip the source size to the expected maximum
...
A packet larger than cin->bitmap_size does not make sense.
Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
2013-07-19 22:14:07 +02:00
Luca Barbato
dd0bfc3a6a
dsicinav: Bound-check the source buffer when needed
...
Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
2013-07-19 22:14:07 +02:00
Luca Barbato
fcae3ff124
dsicinav: K&R formatting cosmetics
2013-07-19 22:14:07 +02:00
Michael Niedermayer
db33010483
jpeg2000dec: silence unused variable warning
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-07-19 17:54:57 +02:00
Piotr Bandurski
5f39992ed9
bmp: fix decoding of flipped rle4
...
Fixes ticket #2794
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-07-19 17:42:34 +02:00
Michael Niedermayer
fc6de70c44
jpeg2000dec: Support non subsampled 8bit planar pixel formats
...
Fixes file2.jp2
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-07-18 21:50:32 +02:00
Michael Niedermayer
99de97cabf
jpeg2000dec: parse CDEF
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Conflicts:
libavcodec/jpeg2000dec.c
Reviewed-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-07-18 21:43:42 +02:00
Carl Eugen Hoyos
b39a6bbe7f
Fix pix_fmt detection in the native jpeg2000 decoder.
...
Based on b7a928b
by Michael Bradshaw.
Fixes ticket #2683 .
Reviewed-by: Nicolas Bertrand
2013-07-18 13:51:24 +02:00
Michael Niedermayer
9d01bf7d66
Merge remote-tracking branch 'qatar/master'
...
* qatar/master:
Consistently use "cpu_flags" as variable/parameter name for CPU flags
Conflicts:
libavcodec/x86/dsputil_init.c
libavcodec/x86/h264dsp_init.c
libavcodec/x86/hpeldsp_init.c
libavcodec/x86/motion_est.c
libavcodec/x86/mpegvideo.c
libavcodec/x86/proresdsp_init.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-07-18 09:53:47 +02:00
Diego Biurrun
3ac7fa81b2
Consistently use "cpu_flags" as variable/parameter name for CPU flags
2013-07-18 00:31:35 +02:00
Vignesh Venkatasubramanian
33968c201c
Fixing a stride issue in VP8 Alpha encode
...
When encoding alpha channel in libvpx, the stride isn't set
properly for the alpha encoder. Fixing it.
Signed-off-by: Vignesh Venkatasubramanian <vigneshv@google.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-07-17 13:38:26 +02:00
Michael Niedermayer
b4fe41c981
Merge remote-tracking branch 'qatar/master'
...
* qatar/master:
fmtconvert: Explicitly use int32_t instead of int
Conflicts:
libavcodec/ac3dec.c
libavcodec/fmtconvert.c
libavcodec/fmtconvert.h
See: f49564c607
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-07-17 10:48:56 +02:00
Michael Niedermayer
10336ca640
Merge commit '50612484e058e8b241f0528584d64d9d2ccebf12'
...
* commit '50612484e058e8b241f0528584d64d9d2ccebf12':
pthread: Rename thread_init to avoid symbol collision
Conflicts:
libavcodec/pthread.c
libavfilter/pthread.c
See: 674d8a9629
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-07-17 10:40:15 +02:00
Christophe Gisquet
b6293e2798
fmtconvert: Explicitly use int32_t instead of int
...
Signed-off-by: Martin Storsjö <martin@martin.st>
2013-07-17 11:02:47 +03:00
Stefano Sabatini
53c853e049
lavc/h264_mp4toannexb: improve feedback in case of invalid bitstream
2013-07-17 01:17:32 +02:00
Michael Niedermayer
a80e622924
avcodec/avutil: Add AVColorSpace and AVColorRange to AVFrames
...
This also moves AVColorSpace and AVColorRange from avcodec to avutil
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-07-17 01:15:31 +02:00
Stefano Sabatini
0092bcdf06
lavc/avcodec.h: fix various typos in av_bitstream_filter_filter() docs
2013-07-17 00:51:43 +02:00
Sean McGovern
50612484e0
pthread: Rename thread_init to avoid symbol collision
...
The AIX threads library exposes a function with the same name.
Signed-off-by: Martin Storsjö <martin@martin.st>
2013-07-17 00:13:31 +03:00
Michael Niedermayer
0b95f01140
Merge commit '8f24c12be7a3b3ea105e67bba9a867fe210a2333'
...
* commit '8f24c12be7a3b3ea105e67bba9a867fe210a2333':
ac3dec: Don't consume more data than the actual input packet size
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-07-15 23:42:58 +02:00
Martin Storsjö
8f24c12be7
ac3dec: Don't consume more data than the actual input packet size
...
This was handled properly in the normal return case at the end
of the function, but not in this special case.
Returning a value larger than the input packet size can cause
problems for certain library users.
Returning the actual input buffer size unconditionally, since
it is not guaranteed that frame_size is set to a sensible
value at this point.
Cc: libav-stable@libav.org
Signed-off-by: Martin Storsjö <martin@martin.st>
2013-07-15 21:37:21 +03:00
Alexis Ballier
69383d055e
ra144enc: set supported channel layouts.
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-07-15 18:04:33 +02:00
Michael Niedermayer
fcbf16a76f
Merge remote-tracking branch 'qatar/master'
...
* qatar/master:
indeo: Reject impossible FRAMETYPE_NULL
Conflicts:
libavcodec/ivi_common.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-07-15 14:08:06 +02:00
Michael Niedermayer
c4b904caea
Merge commit 'f9e5261cab067be7278f73d515bc9b601eb56202'
...
* commit 'f9e5261cab067be7278f73d515bc9b601eb56202':
indeo: Do not reference mismatched tiles
Conflicts:
libavcodec/ivi_common.c
See: dab70c62d2
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-07-15 13:58:38 +02:00
Michael Niedermayer
8e4ecd8774
Merge commit '28dda8a691f1c723a4a9365ab85f9625f1330096'
...
* commit '28dda8a691f1c723a4a9365ab85f9625f1330096':
indeo: Sanitize ff_ivi_init_planes fail paths
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-07-15 13:45:36 +02:00
Michael Niedermayer
e3b13c1081
Merge commit 'b0eeb9d442e4b7e82f6797d74245434ea33110a5'
...
* commit 'b0eeb9d442e4b7e82f6797d74245434ea33110a5':
indeo5: return proper error codes
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-07-15 13:18:29 +02:00
Michael Niedermayer
1cd74a9b4d
Merge commit '25a6666f6c07c6ac8449a63d7fbce0dfd29c54cd'
...
* commit '25a6666f6c07c6ac8449a63d7fbce0dfd29c54cd':
indeo: Bound-check before applying motion compensation
The added checks and one previously added check are replaced by asserts,
the conditions can only be
true when vectors are invalid or there are worse inconsistencies.
We are checking the vectors validity and there should be no
inconsistencies, thus the checks should not be needed.
Also no files are known to cause any anomalies in ffmpeg
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-07-15 13:13:52 +02:00
Stefano Sabatini
4aa2874ab1
lavc/avcodec.h: extend documentation for AVPicture API
2013-07-15 12:24:47 +02:00
Luca Barbato
5b2a29552c
indeo: Reject impossible FRAMETYPE_NULL
...
A frame marked FRAMETYPE_NULL cannot be scalable and requires a
previous frame successfully decoded.
Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
2013-07-15 11:46:50 +02:00
Luca Barbato
f9e5261cab
indeo: Do not reference mismatched tiles
...
Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
2013-07-15 11:46:30 +02:00
Luca Barbato
28dda8a691
indeo: Sanitize ff_ivi_init_planes fail paths
...
Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
2013-07-15 11:29:59 +02:00
Luca Barbato
b0eeb9d442
indeo5: return proper error codes
2013-07-15 11:29:59 +02:00
Luca Barbato
25a6666f6c
indeo: Bound-check before applying motion compensation
...
Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
2013-07-15 11:29:59 +02:00
Michael Niedermayer
febbddbdd5
indeo4: print an error message if ref_mb is needed but unavailable
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-07-14 15:18:03 +02:00
Michael Niedermayer
76d0a6656b
indeo: print errors if transform and block size mismatch
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-07-14 14:20:42 +02:00
Michael Niedermayer
a8e5fac1fb
Merge remote-tracking branch 'qatar/master'
...
* qatar/master:
indeo: Bound-check before applying transform
Conflicts:
libavcodec/indeo4.c
libavcodec/indeo5.c
libavcodec/ivi_common.c
See: af38823709
, 0846719dd1
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-07-14 13:37:40 +02:00
Michael Niedermayer
ccb422a697
Merge commit 'cd78e934c246d1b2510f8fba0abfe40bb75795f6'
...
* commit 'cd78e934c246d1b2510f8fba0abfe40bb75795f6':
indeo4: Validate scantable dimension
See: 92f7f1db42
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-07-14 13:08:13 +02:00