Michael Niedermayer
b4013899e2
j2k: s/ff_j2k_getsigctxno/ff_jpeg2000_getsigctxno/g
...
Also add a related comment
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-26 18:22:16 +02:00
Michael Niedermayer
ac325f0613
j2k.h: whitespace cosmetics
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-26 18:22:16 +02:00
Michael Niedermayer
5b4cad4a64
j2k.h: remove disabled debug code
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-26 18:07:49 +02:00
Michael Niedermayer
ad194874ee
j2k.h: Merges various cosmetics & unused defines
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-26 18:07:48 +02:00
Michael Niedermayer
da90661718
j2k/jpeg2000: merge copyright
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-26 18:07:48 +02:00
Michael Niedermayer
e708c7fa21
j2k: drop disabled debug code
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-26 18:07:48 +02:00
Michael Niedermayer
e66faf71eb
j2k: merge ff_j2k_init_tier1_luts()
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-26 18:07:48 +02:00
Michael Niedermayer
b67fe48f34
jpeg2000/j2k: merge getsigctxno()
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-26 18:07:48 +02:00
Michael Niedermayer
69b9773980
j2k: s/getnbctxno/getsigctxno/g
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-26 18:07:48 +02:00
Michael Niedermayer
5157ec89ef
j2k: redesign vert_causal_ctx_csty implementation
...
The old implementation was incomplete and could not have worked
This also fixes some warnings
New code is untested as i dont seem to have a sample file that uses this.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-26 18:07:48 +02:00
Michael Niedermayer
438c45c08a
j2kdec: fix used bytestream function
...
Found-by: durandal_1707
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-26 15:00:23 +02:00
Michael Niedermayer
d42106c3ac
j2k: rename a few inline functions and data tables to match jpeg2000
...
also inlcudes some other cosmetics
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-26 14:02:44 +02:00
Michael Niedermayer
c78f3e5571
j2kdec: prog_order reading from jpeg2000dec
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-26 13:57:56 +02:00
Michael Niedermayer
81be0965e3
j2k: merge Jpeg2000CodingStyle from jpeg2000
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-26 13:57:56 +02:00
Michael Niedermayer
4cf7b87551
av_cpu_count: factorize "detected %d logical cores" message
...
Also print the message just once
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-26 03:19:55 +02:00
Michael Niedermayer
5f44f47b72
mpegvideo_enc: do not unreference frames before the code is done with them
...
Fixes Ticket2592
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-25 20:30:50 +02:00
Michael Niedermayer
42bb3e4db6
avcodec: remove ff_get_logical_cpus()
...
This simplifies the code
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-24 20:25:53 +02:00
Michael Niedermayer
fe40a9f98f
Merge commit '2a6eaeaa85d17b27ee0dd449183ec197c35c9675'
...
* commit '2a6eaeaa85d17b27ee0dd449183ec197c35c9675':
Move get_logical_cpus() from lavc/pthread to lavu/cpu.
Conflicts:
doc/APIchanges
libavcodec/pthread.c
libavutil/cpu.c
libavutil/cpu.h
libavutil/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-24 13:24:28 +02:00
Michael Niedermayer
a4d3757b29
Merge commit '90f9a5830b5d332de7ebb1ab45589f1870cbd65d'
...
* commit '90f9a5830b5d332de7ebb1ab45589f1870cbd65d':
w32pthreads: move from lavc to compat/
Conflicts:
libavcodec/Makefile
libavcodec/pthread.c
libavcodec/vp8.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-24 13:01:41 +02:00
Michael Niedermayer
029353e427
Merge commit 'e9e5a1bdc769a7225ab0d4f8b33bcacc6496bd68'
...
* commit 'e9e5a1bdc769a7225ab0d4f8b33bcacc6496bd68':
Monkey's Audio old versions FATE tests
h264_parser: Set field_order and picture_structure.
Conflicts:
libavcodec/h264_parser.c
tests/fate/lossless-audio.mak
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-24 12:15:56 +02:00
Michael Niedermayer
0c25c398da
Merge commit 'b493847df4ff8ce46f258749e4a3f304696b34c1'
...
* commit 'b493847df4ff8ce46f258749e4a3f304696b34c1':
avcodec: Add picture structure information to AVCodecParserContext.
Conflicts:
doc/APIchanges
libavcodec/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-24 11:51:58 +02:00
Anton Khirnov
2a6eaeaa85
Move get_logical_cpus() from lavc/pthread to lavu/cpu.
...
It will be useful in lavfi, and could conceivably be useful to the user
applications as well.
2013-05-24 09:28:00 +02:00
Anton Khirnov
90f9a5830b
w32pthreads: move from lavc to compat/
...
It will be used in other places than lavc.
2013-05-24 09:26:54 +02:00
Yusuke Nakamura
3f1a7ceb2c
h264_parser: Set field_order and picture_structure.
...
Signed-off-by: Anton Khirnov <anton@khirnov.net>
2013-05-24 08:45:05 +02:00
Yusuke Nakamura
b493847df4
avcodec: Add picture structure information to AVCodecParserContext.
...
Signed-off-by: Anton Khirnov <anton@khirnov.net>
2013-05-24 08:43:14 +02:00
Paul B Mahol
102848e3b6
s302menc: unbreak compilation
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-05-23 20:38:53 +00:00
Paul B Mahol
e75ddb7df5
s302menc: fix bits_per_raw_sample for 21, 22 & 23 case
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-05-23 20:36:17 +00:00
Paul B Mahol
d683271753
lavc/codec_desc: SMPTE 302M is not lossy
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-05-23 20:26:19 +00:00
Paul B Mahol
15b9c0b49f
escape124: switch to init_get_bits8()
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-05-23 19:58:03 +00:00
Paul B Mahol
cdc3f8f307
escape124: pass context to av_log()
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-05-23 19:53:08 +00:00
Paul B Mahol
abf1e59ef2
libaacplus: return meaningful error codes
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-05-23 19:41:43 +00:00
Paul B Mahol
6d53034483
libaacplus: cosmetics: fix indentation
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-05-23 19:41:43 +00:00
Paul B Mahol
963c58006f
libaacplus: move profile check above, simplifies code a little
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-05-23 19:41:38 +00:00
Michael Niedermayer
eee19198ef
avcodec/libfaac: fallback to a supported bitrate if the requested is not supported
...
Fixes: Ticket2587
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-23 15:37:48 +02:00
Michael Niedermayer
ef43b9496b
avcodec/mpegvideo: remove empty comments
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-23 14:43:42 +02:00
Darryl Wallace
3e16047507
s302m encoder
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-05-23 12:03:06 +00:00
Paul B Mahol
fbd0f91a3a
escape130: switch to init_get_bits8()
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-05-23 10:21:12 +00:00
Michael Niedermayer
ac2c52174f
avcodec/wavpack: remove ;;
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-23 12:07:31 +02:00
Paul B Mahol
79f452f4e6
fraps: set avctx->color_range
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-05-23 10:05:28 +00:00
Michael Niedermayer
b7d16dc4bd
Merge remote-tracking branch 'qatar/master'
...
* qatar/master:
wavpack: check packet size early
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-23 10:55:46 +02:00
Michael Niedermayer
402bec52d4
Merge commit '3f0b6d7a6248a33df37b98cfcb37a1acce263f62'
...
* commit '3f0b6d7a6248a33df37b98cfcb37a1acce263f62':
wavpack: use bytestream2 in wavpack_decode_block
Conflicts:
libavcodec/wavpack.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-23 10:46:05 +02:00
Michael Niedermayer
1724123c65
Merge commit '3eae9b030cbbdc263f69834b791624613032d548'
...
* commit '3eae9b030cbbdc263f69834b791624613032d548':
mpegvideo: unref buffers in ff_mpeg_unref_picture on frame size changes
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-23 10:25:25 +02:00
Luca Barbato
fd06291239
wavpack: check packet size early
...
Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
2013-05-22 22:02:57 +02:00
Luca Barbato
3f0b6d7a62
wavpack: use bytestream2 in wavpack_decode_block
...
Prevent most out of buffer reads.
Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
2013-05-22 22:02:55 +02:00
Michael Niedermayer
657875b145
avcodec/aic: Fix vlc value checks
...
Fixes out of array accesses
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-22 21:30:28 +02:00
Michael Niedermayer
30df9789a9
proresdec: Fix end condition
...
Fixes out of array writes
No FFmpeg release is affected by this
This also fixes some artifacts
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-22 20:24:50 +02:00
Michael Niedermayer
df3ee7b9a9
smvjpegdec: use av_pix_fmt_desc_get() avoid direct table access
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-22 20:24:50 +02:00
Michael Niedermayer
ad22767cb6
shorten: fix "off by padding" bug
...
Fixes array overread
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-22 17:40:12 +02:00
Janne Grunau
3eae9b030c
mpegvideo: unref buffers in ff_mpeg_unref_picture on frame size changes
...
ff_mpeg_unref_picture clears the flag indicating that the frame needs to
be reallocated after a frame size change. Since we have now reference
counted buffers we can unref the buffers immediately.
2013-05-22 15:40:12 +02:00
Ash Hughes
14ec9d2590
Support playing SMV files.
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-22 15:20:22 +02:00