Michael Niedermayer
e33b084ee9
Merge commit 'ecbcebde344c9eaeb8877ba2c5d32eb3af621e7f'
...
* commit 'ecbcebde344c9eaeb8877ba2c5d32eb3af621e7f':
vdpau: Adjust necessary #includes for vdpau_internal.h
Conflicts:
libavcodec/vdpau_internal.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
10 years ago
Michael Niedermayer
dfa7cb646d
Merge commit '36cf8eb4489f8709b5fb1cdb87e125ef53301c2f'
...
* commit '36cf8eb4489f8709b5fb1cdb87e125ef53301c2f':
mov: Fix compilation with DEBUG enabled
See: 349a32c436
Merged-by: Michael Niedermayer <michaelni@gmx.at>
10 years ago
Michael Niedermayer
d2223ec2bd
Merge commit '2a9c6fae927964b5dd0b5d3d9292f5621bd21664'
...
* commit '2a9c6fae927964b5dd0b5d3d9292f5621bd21664':
dca: Move all tables into dcadata.h
Conflicts:
libavcodec/dcadec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
10 years ago
Michael Niedermayer
6c44dd6c6e
Merge commit '8a213179aff0174d81b3e889134a3b4f7d21f5c3'
...
* commit '8a213179aff0174d81b3e889134a3b4f7d21f5c3':
dca: Remove trace debugging code
Merged-by: Michael Niedermayer <michaelni@gmx.at>
10 years ago
Michael Niedermayer
877c038a9d
Merge commit 'a96f51f29ac4cd95650a8bcda6c3d5d87c6357fa'
...
* commit 'a96f51f29ac4cd95650a8bcda6c3d5d87c6357fa':
dca: Return more informative error codes
Merged-by: Michael Niedermayer <michaelni@gmx.at>
10 years ago
Michael Niedermayer
ad0be70382
avcodec/dcaenc: rename DCA_SUBBANDS
...
Fixes "warning: DCA_SUBBANDS redefined"
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
10 years ago
Michael Niedermayer
d8901c2f01
Merge commit 'b339019de4e5f4d3c661bbdba98ae248ab77e2f0'
...
* commit 'b339019de4e5f4d3c661bbdba98ae248ab77e2f0':
dca: Split code for handling the EXSS extension off into a separate file
Conflicts:
libavcodec/Makefile
libavcodec/dcadec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
10 years ago
Michael Niedermayer
6998400c61
Merge commit 'bf704132a51f5d838365158331d4e535e1df4c8e'
...
* commit 'bf704132a51f5d838365158331d4e535e1df4c8e':
Don't anonymously typedef structs
Conflicts:
avprobe.c
libavutil/parseutils.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
10 years ago
Michael Niedermayer
a94eba6f0c
Merge commit '7f9f771eac0d37a632e0ed9bd89961d57fcfb7e0'
...
* commit '7f9f771eac0d37a632e0ed9bd89961d57fcfb7e0':
avcodec: Don't anonymously typedef structs
Conflicts:
libavcodec/alac.c
libavcodec/cinepak.c
libavcodec/cscd.c
libavcodec/dcadec.c
libavcodec/g723_1.c
libavcodec/gif.c
libavcodec/iff.c
libavcodec/kgv1dec.c
libavcodec/libopenjpegenc.c
libavcodec/libspeexenc.c
libavcodec/ra288.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
10 years ago
Michael Niedermayer
a0fe1a25fa
Merge commit 'daf8cf358a098a903d59adb6c0d0cc3262a8c93e'
...
* commit 'daf8cf358a098a903d59adb6c0d0cc3262a8c93e':
avformat: Don't anonymously typedef structs
Conflicts:
libavformat/adtsenc.c
libavformat/aiffenc.c
libavformat/avidec.c
libavformat/gif.c
libavformat/iff.c
libavformat/img2dec.c
libavformat/jvdec.c
libavformat/matroskadec.c
libavformat/udp.c
libavformat/wtvdec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
10 years ago
Clément Bœsch
4ab7eb0da2
avfilter: bump minor and Changelog document the new filters
10 years ago
Clément Bœsch
bab4fcebb1
avfilter: add paletteuse filter
10 years ago
Clément Bœsch
9b964690e3
avfilter: add palettegen filter
10 years ago
Clément Bœsch
3cab173e23
avcodec/gif: support crop and transparency with PAL8
10 years ago
Clément Bœsch
5f9986f597
avformat/gif: use first packet palette as global for PAL8
...
This will allow the payload in PAL8 packets to not contain 768B of local
palette (which is not LZW compressed).
10 years ago
Clément Bœsch
adb9b235b6
avformat/gif: simplify gif_image_write_header() prototype
10 years ago
Paul B Mahol
088dfd3ff1
avcodec/dxtory: use init_get_bits8()
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
10 years ago
Michael Niedermayer
4177f501b4
Merge commit '7769be590c7aeb2aad26ca723d105cf5203e33d2'
...
* commit '7769be590c7aeb2aad26ca723d105cf5203e33d2':
vp56: Return meaningful error codes
Conflicts:
libavcodec/vp56.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
10 years ago
Gilles Chanteperdrix
3eec775b21
avformat/rtpdec_ac3: add AC3 RTP depacketization (RFC 4184)
...
Signed-off-by: Gilles Chanteperdrix <gilles.chanteperdrix@xenomai.org>
Reviewed-by: Thomas Volkert <silvo@gmx.net>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
10 years ago
Diego Biurrun
ecbcebde34
vdpau: Adjust necessary #includes for vdpau_internal.h
10 years ago
Diego Biurrun
36cf8eb448
mov: Fix compilation with DEBUG enabled
10 years ago
Gilles Chanteperdrix
22470510d1
avformat/rtpdec_mpeg12: add robust MPEG audio depacketization (RFC 5219)
...
Reviewed-by: Thomas Volkert <silvo@gmx.net>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
10 years ago
Gilles Chanteperdrix
8ca098f444
avcocdec/mpegaudio_parser: add MP3 ADU headers parser
...
Reviewed-by: Thomas Volkert <silvo@gmx.net>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
10 years ago
Diego Biurrun
2a9c6fae92
dca: Move all tables into dcadata.h
10 years ago
Diego Biurrun
8a213179af
dca: Remove trace debugging code
10 years ago
Diego Biurrun
a96f51f29a
dca: Return more informative error codes
10 years ago
Diego Biurrun
b339019de4
dca: Split code for handling the EXSS extension off into a separate file
10 years ago
Diego Biurrun
bf704132a5
Don't anonymously typedef structs
10 years ago
Diego Biurrun
7f9f771eac
avcodec: Don't anonymously typedef structs
10 years ago
Diego Biurrun
daf8cf358a
avformat: Don't anonymously typedef structs
10 years ago
Himangi Saraogi
7769be590c
vp56: Return meaningful error codes
...
Signed-off-by: Diego Biurrun <diego@biurrun.de>
10 years ago
Christophe Gisquet
b533949813
x86: hevc: remove a parameter to WP internals
...
The second stride is always the internal buffer one, MAX_PB_SIZE (times 2 to
get the value in bytes).
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
10 years ago
zhaoxiu.zeng
a196e0c66d
avcodec/vc1_pred: few branchless optimizations
...
This is also simpler
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
10 years ago
Zhaoxiu Zeng
3b5ad8fbf7
avcodec/parser: optimize ff_mpeg4video_split()
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
10 years ago
Paul B Mahol
ba22295e76
lavc: deprecate VIMA decoder
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
10 years ago
Michael Niedermayer
9ccc4eedd1
avformat/matroskaenc: Do not use native mode for raw RGB
...
This fixes generating totally unplayable files
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
10 years ago
Michael Niedermayer
e2fb12b629
avformat/matroskaenc: fix handling of VFW style raw rgb
...
raw rgb uses 0 as codec tag in "VFW", the code assumed 0 means error
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
10 years ago
Michael Niedermayer
ad1549aec3
avformat/mov: print a warning if parsing udta failed
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
10 years ago
zhaoxiu.zeng
ac7fc444ee
avcodec/apedec: simplify sign conversion
...
Signed-off-by: Zeng Zhaoxiu <zhaoxiu.zeng@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
10 years ago
zhaoxiu.zeng
b11a187575
avcodec/golomb: simplify sign conversion
...
Signed-off-by: Zeng Zhaoxiu <zhaoxiu.zeng@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
10 years ago
zhaoxiu.zeng
0073c8e345
avcodec/apedec: move 'coeffs[256] and delay[256]' into, long_filter_high_3800
...
Signed-off-by: Zeng Zhaoxiu <zhaoxiu.zeng@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
10 years ago
zhaoxiu.zeng
9e6198f0a4
avcodec/wmalosslessdec: simplify
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
10 years ago
zhaoxiu.zeng
80f1378005
avcodec/wmalosslessdec: optimize sign operation
...
Signed-off-by: Zeng Zhaoxiu <zhaoxiu.zeng@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
10 years ago
zhaoxiu.zeng
bc0a440e88
avcodec/wmalosslessdec: change type of acfilter_coeffs from int64_t to int16_t
...
Signed-off-by: Zeng Zhaoxiu <zhaoxiu.zeng@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
10 years ago
zhaoxiu.zeng
e4ea84e12e
avcodec/wmv2: simplify cbp_table_index calculation
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
10 years ago
zhaoxiu.zeng
b4b9a64bdb
avcodec/vc1: simplify vc1_split()
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
10 years ago
zhaoxiu.zeng
b39ac9d210
avcodec/vc1: simplify find_next_marker()
...
Signed-off-by: Zeng Zhaoxiu <zhaoxiu.zeng@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
10 years ago
Michael Niedermayer
3e2714992b
Merge commit 'eea769df322fac2601a96db195fa7dc8d12a8fbc'
...
* commit 'eea769df322fac2601a96db195fa7dc8d12a8fbc':
hevc: Use generic av_clip function, not C implementation
Conflicts:
libavcodec/hevc.c
libavcodec/hevc_filter.c
libavcodec/hevc_mvs.c
See: 83976e40e8
Merged-by: Michael Niedermayer <michaelni@gmx.at>
10 years ago
Michael Niedermayer
c74b3983f9
Merge commit 'faa8ffda2c513573733624784f0a7d0a4959d33e'
...
* commit 'faa8ffda2c513573733624784f0a7d0a4959d33e':
doc/APIchanges: fill in missing dates and hashes
Conflicts:
doc/APIchanges
See: c651a1aaec
See: 8c8ee17e8d
and others
Merged-by: Michael Niedermayer <michaelni@gmx.at>
10 years ago
Paul B Mahol
8bb489fab5
fate: add wavpack encoder
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
10 years ago