Michael Niedermayer
|
8d024c5107
|
Merge commit 'cc8163e1a3601a56f722a4720516e860bf1c6198'
* commit 'cc8163e1a3601a56f722a4720516e860bf1c6198':
avcodec: more correct printf specifiers
Conflicts:
libavcodec/4xm.c
libavcodec/alsdec.c
libavcodec/dfa.c
libavcodec/h264_ps.c
libavcodec/jpeg2000dec.c
libavcodec/lagarith.c
libavcodec/mpeg12dec.c
libavcodec/rv10.c
libavcodec/svq3.c
libavcodec/wmaprodec.c
libavcodec/xwddec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
|
2014-03-22 18:43:40 +01:00 |
|
Diego Biurrun
|
cc8163e1a3
|
avcodec: more correct printf specifiers
|
2014-03-22 14:08:20 +01:00 |
|
Michael Niedermayer
|
a392bf6570
|
avcodec/dxtory: fix src size checks
Fixes integer overflow
Fixes out of array read
Fixes: d104661bb59b202df7671fb19a00ca6c-asan_heap-oob_d6429d_5066_cov_1729501105_dxtory_mic.avi
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
|
2014-02-16 21:13:02 +01:00 |
|
Michael Niedermayer
|
4b84a69ebb
|
Merge remote-tracking branch 'qatar/master'
* qatar/master:
dxtory: compressed RGB555/RGB565 decoding support
Conflicts:
libavcodec/dxtory.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
|
2014-01-25 01:39:19 +01:00 |
|
Michael Niedermayer
|
2d0d1f7eb3
|
Merge commit '0e1ad2f591b87e944550c15b54e54f8189743289'
* commit '0e1ad2f591b87e944550c15b54e54f8189743289':
dxtory: add more compressed and uncompressed modes
Conflicts:
libavcodec/dxtory.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
|
2014-01-25 01:33:42 +01:00 |
|
Kostya Shishkov
|
28e1eed3c2
|
dxtory: compressed RGB555/RGB565 decoding support
|
2014-01-24 20:09:51 +01:00 |
|
Kostya Shishkov
|
0e1ad2f591
|
dxtory: add more compressed and uncompressed modes
|
2014-01-24 20:09:44 +01:00 |
|
Michael Niedermayer
|
a298f934ec
|
Merge commit '025fd76e1a2623c858d8c686a73cc30980a314b0'
* commit '025fd76e1a2623c858d8c686a73cc30980a314b0':
dxtory: change error code for unexpected slice configuration
Merged-by: Michael Niedermayer <michaelni@gmx.at>
|
2014-01-21 21:17:16 +01:00 |
|
Michael Niedermayer
|
9eb954b91d
|
Merge commit 'e91a3f1bdba9b4945e42c191d2e35e9844625fb4'
* commit 'e91a3f1bdba9b4945e42c191d2e35e9844625fb4':
dxtory: correctly handle YUV slices with average odd height
Merged-by: Michael Niedermayer <michaelni@gmx.at>
|
2014-01-21 21:01:36 +01:00 |
|
Kostya Shishkov
|
025fd76e1a
|
dxtory: change error code for unexpected slice configuration
|
2014-01-21 17:47:50 +01:00 |
|
Kostya Shishkov
|
e91a3f1bdb
|
dxtory: correctly handle YUV slices with average odd height
|
2014-01-21 17:47:50 +01:00 |
|
Thilo Borgmann
|
d814a839ac
|
Reinstate proper FFmpeg license for all files.
|
2013-08-30 15:47:38 +00: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 |
|
Kostya Shishkov
|
3b03d7e251
|
dxtory v2 support
|
2013-05-28 13:35:09 +02:00 |
|
Diego Biurrun
|
6d97484d72
|
avcodec: av_log_ask_for_sample() ---> avpriv_request_sample()
|
2013-03-13 21:20:12 +01:00 |
|
Anton Khirnov
|
759001c534
|
lavc decoders: work with refcounted frames.
|
2013-03-08 07:38:30 +01:00 |
|
Anton Khirnov
|
df9b956751
|
lavc: fix decode_frame() third parameter semantics for video decoders
It's got_frame, not data size
|
2012-12-04 21:45:36 +01:00 |
|
Anton Khirnov
|
594d4d5df3
|
lavc: add a wrapper for AVCodecContext.get_buffer().
It will be useful in the upcoming transition to refcounted AVFrames.
|
2012-12-04 21:41:59 +01:00 |
|
Diego Biurrun
|
aa91fe8091
|
dxtory: Replace AV_WN16A(AV_RN16A()) combination by AV_COPY16
|
2012-10-23 16:53:42 +02:00 |
|
Anton Khirnov
|
716d413c13
|
Replace PIX_FMT_* -> AV_PIX_FMT_*, PixelFormat -> AVPixelFormat
|
2012-10-08 07:13:26 +02:00 |
|
Martin Storsjö
|
1d9c2dc89a
|
Don't include common.h from avutil.h
Signed-off-by: Martin Storsjö <martin@martin.st>
|
2012-08-15 22:32:06 +03:00 |
|
Anton Khirnov
|
36ef5369ee
|
Replace all CODEC_ID_* with AV_CODEC_ID_*
|
2012-08-07 16:00:24 +02:00 |
|
Kostya Shishkov
|
19341c58e0
|
Dxtory capture format decoder
Signed-off-by: Anton Khirnov <anton@khirnov.net>
|
2011-12-10 11:58:03 +01:00 |
|