OSDN Git Service
Michael Niedermayer [Thu, 14 Mar 2013 12:31:38 +0000 (13:31 +0100)]
avdevice: bump major
Our previous release (1.1) contained a version 54 libavdevice
and this version here is not ABI compatible thus a bump is
needed
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 14 Mar 2013 12:07:25 +0000 (13:07 +0100)]
Merge remote-tracking branch 'qatar/master'
* qatar/master:
avcodec: av_log_missing_feature(1) ---> avpriv_request_sample()
Conflicts:
libavcodec/aacsbr.c
libavcodec/amrnbdec.c
libavcodec/takdec.c
libavcodec/tta.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 14 Mar 2013 11:52:12 +0000 (12:52 +0100)]
Merge commit '
6d97484d72e33f7dde9493a9ead1a72e2f029605'
* commit '
6d97484d72e33f7dde9493a9ead1a72e2f029605':
avcodec: av_log_ask_for_sample() ---> avpriv_request_sample()
rsodec: Use avpriv_report_missing_feature() where appropriate
Conflicts:
libavcodec/anm.c
libavcodec/mlpdec.c
libavcodec/pictordec.c
libavcodec/sunrast.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 14 Mar 2013 11:41:34 +0000 (12:41 +0100)]
Merge commit '
1ecdf8912b9ced51b3267cdcdce5e394d0a3bf8e'
* commit '
1ecdf8912b9ced51b3267cdcdce5e394d0a3bf8e':
avformat: av_log_ask_for_sample() ---> avpriv_request_sample()
Conflicts:
libavformat/mxfdec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 14 Mar 2013 11:30:19 +0000 (12:30 +0100)]
Merge commit '
63d744e2be39466e3a734c2987cd713e0bac101e'
* commit '
63d744e2be39466e3a734c2987cd713e0bac101e':
av_log_missing_feature() ---> avpriv_report_missing_feature()
Conflicts:
libavcodec/aacdec.c
libavcodec/tta.c
libavformat/mpegts.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 14 Mar 2013 11:02:43 +0000 (12:02 +0100)]
Merge commit '
f099d3d1d5466bd63f4ab36270d169ff9ea613b8'
* commit '
f099d3d1d5466bd63f4ab36270d169ff9ea613b8':
Add av_log_{ask_for_sample|missing_feature} replacements to libavutil
ismindex: Check the return value of allocations
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 14 Mar 2013 10:58:11 +0000 (11:58 +0100)]
Merge commit '
7c147900b86c0f1cf030b7b844c670649c80c191'
* commit '
7c147900b86c0f1cf030b7b844c670649c80c191':
ismindex: Factorize code for printing chunk duration lists
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 14 Mar 2013 10:48:42 +0000 (11:48 +0100)]
Merge commit '
f05e9beb4ab5fb8b9d5ba81405e9fca901832591'
* commit '
f05e9beb4ab5fb8b9d5ba81405e9fca901832591':
ismindex: Rename structs and fields from "file" to "track"
avpacket: copy side data type and size in av_dup_packet
Conflicts:
libavcodec/avpacket.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Paul B Mahol [Thu, 14 Mar 2013 09:45:40 +0000 (09:45 +0000)]
lavc: do not set coded_frame->reference
That field is deprecated.
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Clément Bœsch [Thu, 14 Mar 2013 05:25:20 +0000 (06:25 +0100)]
Revert "lavfi/ebur128: fix format negociation for output."
This reverts commit
9efcfbed9dd64679145f5f39d9a812dfeea97172.
All the shame on me; this commit is actually causing more problems
(broken outputs but also crashes) than it was solving.
Clément Bœsch [Wed, 13 Mar 2013 23:56:20 +0000 (00:56 +0100)]
lavfi/ebur128: fix format negociation for output.
Before this change, the audio input and output formats are set
independently, so the lavfi negociation could pick different settings
for the input and output. This is particularly true for the channel
layout settings, where multiple choices were available.
Fixes Ticket2342.
Clément Bœsch [Wed, 13 Mar 2013 22:59:25 +0000 (23:59 +0100)]
lavfi/thumbnail: support flushing.
This makes possible the raise of one picture if the input has less than
the number of frames to analyze.
Fixes Ticket1992.
Hendrik Leppkes [Wed, 13 Mar 2013 20:01:26 +0000 (21:01 +0100)]
lavfi/avcodec: fix API version checks
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Hendrik Leppkes [Wed, 13 Mar 2013 20:01:25 +0000 (21:01 +0100)]
lavfi/avcodec: cleanup includes
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Hendrik Leppkes [Wed, 13 Mar 2013 17:51:17 +0000 (18:51 +0100)]
tiff: fix handling of metadata with refcounted frames
Since the conversion to refcounted frames, the tiff decoder
only wrote the metadata into its internal "picture" in its own context,
never exposing the metadata to the user, and eventually leaking the
metadata.
Instead, properly store the metadata directly into the frame being decoded into.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
James Darnley [Sun, 10 Mar 2013 14:08:50 +0000 (15:08 +0100)]
yadif: restore speed of the C filtering code
Always use the special filter for the first and last 3 columns (only).
Changes made in
64ed397 slowed the filter to just under 3/4 of what it
was. This commit restores the speed while maintaining identical output.
For reference, on my Athlon64:
1733222 decicycles in old
2358563 decicycles in new
1727558 decicycles in this
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diego Biurrun [Wed, 13 Mar 2013 20:18:34 +0000 (21:18 +0100)]
avcodec: av_log_missing_feature(1) ---> avpriv_request_sample()
Diego Biurrun [Wed, 13 Mar 2013 20:17:05 +0000 (21:17 +0100)]
avcodec: av_log_ask_for_sample() ---> avpriv_request_sample()
Diego Biurrun [Sat, 9 Mar 2013 22:15:41 +0000 (23:15 +0100)]
rsodec: Use avpriv_report_missing_feature() where appropriate
Diego Biurrun [Mon, 25 Feb 2013 22:54:28 +0000 (23:54 +0100)]
avformat: av_log_ask_for_sample() ---> avpriv_request_sample()
Diego Biurrun [Mon, 25 Feb 2013 22:53:52 +0000 (23:53 +0100)]
av_log_missing_feature() ---> avpriv_report_missing_feature()
Diego Biurrun [Tue, 22 Jan 2013 01:41:54 +0000 (02:41 +0100)]
Add av_log_{ask_for_sample|missing_feature} replacements to libavutil
This allows reporting missing features and requesting samples from
all libraries in a standard way; with a simplified API.
Stefano Sabatini [Wed, 13 Mar 2013 00:13:04 +0000 (01:13 +0100)]
lavfi/cropdetect: add support for named options
Hendrik Leppkes [Wed, 13 Mar 2013 16:51:07 +0000 (17:51 +0100)]
lavu/frame: free frame metadata when unrefing a frame.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Hendrik Leppkes [Wed, 13 Mar 2013 16:51:06 +0000 (17:51 +0100)]
avcodec: remove AVCodecContext->metadata
This field was only ever set and freed from avcodec, and not otherwise
used. However, because frames are refcounted now, avcodec cannot make any
assumptions about the lifetime of the frame metadata, which can result in
double-frees or leaked memory.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Martin Storsjö [Wed, 13 Mar 2013 12:13:46 +0000 (14:13 +0200)]
ismindex: Check the return value of allocations
Signed-off-by: Martin Storsjö <martin@martin.st>
Martin Storsjö [Wed, 13 Mar 2013 10:29:43 +0000 (12:29 +0200)]
ismindex: Factorize code for printing chunk duration lists
Signed-off-by: Martin Storsjö <martin@martin.st>
Martin Storsjö [Wed, 13 Mar 2013 09:42:34 +0000 (11:42 +0200)]
ismindex: Rename structs and fields from "file" to "track"
The tool nowadays supports more than one track per file,
this makes reading the code slightly less confusing.
Signed-off-by: Martin Storsjö <martin@martin.st>
Clément Bœsch [Wed, 13 Mar 2013 03:21:53 +0000 (04:21 +0100)]
lavfi/delogo: remove sscanf and rely on av_opt_set_from_string() only.
Clément Bœsch [Wed, 13 Mar 2013 17:56:34 +0000 (18:56 +0100)]
lavc/crystalhd: remove now unecessary buffer_hints.
Clément Bœsch [Tue, 12 Mar 2013 07:41:53 +0000 (08:41 +0100)]
lavc: factorize ff_{thread_,re,}get_buffer error messages.
Coccinelle profile used:
@@
expression r, ctx, f, loglevel, str, flags;
@@
-if ((r = ff_get_buffer(ctx, f, flags)) < 0) {
- av_log(ctx, loglevel, str);
- return r;
-}
+if ((r = ff_get_buffer(ctx, f, flags)) < 0)
+ return r;
@@
expression r, ctx, f, loglevel, str;
@@
-if ((r = ff_reget_buffer(ctx, f)) < 0) {
- av_log(ctx, loglevel, str);
- return r;
-}
+if ((r = ff_reget_buffer(ctx, f)) < 0)
+ return r;
@@
expression r, ctx, f, loglevel, str, flags;
@@
-if ((r = ff_thread_get_buffer(ctx, f, flags)) < 0) {
- av_log(ctx, loglevel, str);
- return r;
-}
+if ((r = ff_thread_get_buffer(ctx, f, flags)) < 0)
+ return r;
...along with some manual patches for the remaining ones.
Clément Bœsch [Wed, 13 Mar 2013 09:23:14 +0000 (10:23 +0100)]
lavfi/thumbnail: remove unecessary poll_frame() callback.
Clément Bœsch [Wed, 13 Mar 2013 08:57:31 +0000 (09:57 +0100)]
lavfi/mptestsrc: raise filter_frame() error.
Clément Bœsch [Wed, 13 Mar 2013 08:57:18 +0000 (09:57 +0100)]
lavfi/mandelbrot: raise filter_frame() error.
Clément Bœsch [Wed, 13 Mar 2013 08:57:11 +0000 (09:57 +0100)]
lavfi/life: raise filter_frame() error.
Clément Bœsch [Wed, 13 Mar 2013 08:57:05 +0000 (09:57 +0100)]
lavfi/cellauto: raise filter_frame() error.
Clément Bœsch [Wed, 13 Mar 2013 08:56:58 +0000 (09:56 +0100)]
lavfi/alphamerge: raise filter_frame() error.
Clément Bœsch [Wed, 13 Mar 2013 08:56:50 +0000 (09:56 +0100)]
lavfi/movie: raise filter_frame() error.
Clément Bœsch [Wed, 13 Mar 2013 08:56:42 +0000 (09:56 +0100)]
lavfi/buffersrc: raise filter_frame() error.
Clément Bœsch [Wed, 13 Mar 2013 08:56:35 +0000 (09:56 +0100)]
lavfi/showspectrum: raise filter_frame() error.
Clément Bœsch [Wed, 13 Mar 2013 08:56:26 +0000 (09:56 +0100)]
lavfi/avfilter: raise filter_frame() error.
Clément Bœsch [Wed, 13 Mar 2013 08:56:18 +0000 (09:56 +0100)]
lavfi/concat: raise filter_frame() error.
Clément Bœsch [Wed, 13 Mar 2013 08:56:09 +0000 (09:56 +0100)]
lavfi/anullsrc: raise filter_frame() error.
Clément Bœsch [Wed, 13 Mar 2013 08:55:56 +0000 (09:55 +0100)]
lavfi/aevalsrc: raise filter_frame() error.
Clément Bœsch [Wed, 13 Mar 2013 08:55:43 +0000 (09:55 +0100)]
lavfi/atempo: raise filter_frame() error.
Clément Bœsch [Wed, 13 Mar 2013 08:55:32 +0000 (09:55 +0100)]
lavfi/asetnsamples: raise filter_frame() error.
Clément Bœsch [Wed, 13 Mar 2013 08:55:18 +0000 (09:55 +0100)]
lavfi/aresample: raise filter_frame() error.
Hendrik Leppkes [Wed, 13 Mar 2013 12:44:55 +0000 (13:44 +0100)]
lavu/frame: av_frame_make_writable: set the channels on the new frame.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Hendrik Leppkes [Wed, 13 Mar 2013 12:41:21 +0000 (13:41 +0100)]
lavu/frame: copy all frame properties in av_frame_copy_props
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Hendrik Leppkes [Wed, 13 Mar 2013 12:20:43 +0000 (13:20 +0100)]
dsputil: remove deprecated dsp_mask usage
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 13 Mar 2013 14:07:46 +0000 (15:07 +0100)]
dsputil_mmx: remove unused variables
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 13 Mar 2013 13:56:22 +0000 (14:56 +0100)]
exr: silence warning "libavcodec/exr.c:351:9: warning: variable ret set but not used"
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 13 Mar 2013 13:49:00 +0000 (14:49 +0100)]
Merge remote-tracking branch 'qatar/master'
* qatar/master:
hqdn3d: Fix out of array read in LOWPASS
cabac: remove unused argument of ff_init_cabac_states()
rawdec: fix a typo -- || instead of |
Conflicts:
libavcodec/cabac.c
libavcodec/h264.c
libavfilter/vf_hqdn3d.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 13 Mar 2013 13:41:18 +0000 (14:41 +0100)]
Merge commit '
37cb3b180a1dc3d6f123f68e0806585ebc2578b6'
* commit '
37cb3b180a1dc3d6f123f68e0806585ebc2578b6':
matroskadec: request a read buffer for the wav header
See:
d0b450457b3aeb8c234b0b0a987db55d3485326b
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 13 Mar 2013 13:31:39 +0000 (14:31 +0100)]
vc1: fix int/ptrdiff_t mismatches
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 13 Mar 2013 13:18:53 +0000 (14:18 +0100)]
Merge commit '
a8b6015823e628047a45916404c00044c5e80415'
* commit '
a8b6015823e628047a45916404c00044c5e80415':
dsputil: convert remaining functions to use ptrdiff_t strides
Conflicts:
libavcodec/dsputil.h
libavcodec/dsputil_template.c
libavcodec/h264qpel_template.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 13 Mar 2013 13:03:22 +0000 (14:03 +0100)]
Merge commit '
a4472ac01e86f9fae5adb9034f2777b86a9c5480'
* commit '
a4472ac01e86f9fae5adb9034f2777b86a9c5480':
Add informative messages to av_log_ask_for_sample calls lacking them
anm: Get rid of some very silly goto statements
Conflicts:
libavformat/anm.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 13 Mar 2013 12:53:02 +0000 (13:53 +0100)]
Merge commit '
202c2acc40a6de8758b44ab3f5c85ab250079734'
* commit '
202c2acc40a6de8758b44ab3f5c85ab250079734':
vda: remove async decoder leftovers
Conflicts:
libavcodec/vda_h264.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 13 Mar 2013 12:45:50 +0000 (13:45 +0100)]
Merge commit '
a2816230c5c0a8fc72bc0163b7d21a96b194d87a'
* commit '
a2816230c5c0a8fc72bc0163b7d21a96b194d87a':
avframe: call release_buffer only if it is set
Conflicts:
libavcodec/utils.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 13 Mar 2013 12:39:01 +0000 (13:39 +0100)]
Merge commit '
fce68c93554803801c32c1b20509bfa8d496b02a'
* commit '
fce68c93554803801c32c1b20509bfa8d496b02a':
pthread: unref the decoded but not returned frames on close.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 13 Mar 2013 12:32:59 +0000 (13:32 +0100)]
Merge commit '
555000c7d5c1e13043a948ebc48d2939b0ba6536'
* commit '
555000c7d5c1e13043a948ebc48d2939b0ba6536':
h264: check that DPB is allocated before accessing it in flush_dpb()
vf_hqdn3d: fix uninitialized variable use
vf_gradfun: fix uninitialized variable use
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 13 Mar 2013 12:28:29 +0000 (13:28 +0100)]
Merge commit '
c2597c5a0a08526493abb9bc9544b61a290fe20f'
* commit '
c2597c5a0a08526493abb9bc9544b61a290fe20f':
h264_refs: cosmetics, reformat
Conflicts:
libavcodec/h264_refs.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 13 Mar 2013 12:17:43 +0000 (13:17 +0100)]
Merge commit '
f08fefc4d099f2a1f2e3a6db3d340537e601f762'
* commit '
f08fefc4d099f2a1f2e3a6db3d340537e601f762':
h264: remove a useless svq3 condition
mpegvideo: remove FMT_H264
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 13 Mar 2013 12:12:06 +0000 (13:12 +0100)]
Merge remote-tracking branch 'cehoyos/master'
* cehoyos/master:
avframe: Copy buffer type in copy_props.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 13 Mar 2013 12:08:04 +0000 (13:08 +0100)]
Merge commit '
ee8704916de79158da8a48a9ea5be819e83d23ba'
* commit '
ee8704916de79158da8a48a9ea5be819e83d23ba':
mpegvideo: reindent
Conflicts:
libavcodec/mpegvideo.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Carl Eugen Hoyos [Wed, 13 Mar 2013 11:47:56 +0000 (12:47 +0100)]
avframe: Copy buffer type in copy_props.
Fixes VDPAU decoding with MPlayer.
Michael Niedermayer [Wed, 13 Mar 2013 11:56:43 +0000 (12:56 +0100)]
Merge commit '
19cac8e301419dcde31526d15196a952ddf2c4c7'
* commit '
19cac8e301419dcde31526d15196a952ddf2c4c7':
mpegvideo: remove useless references to h264 and svq3
Conflicts:
libavcodec/mpegvideo.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 13 Mar 2013 11:50:50 +0000 (12:50 +0100)]
Merge commit '
85a5bc054c1290699ccbf5799ba6c4e2fbcc3530'
* commit '
85a5bc054c1290699ccbf5799ba6c4e2fbcc3530':
lavf: remove disabled FF_API_R_FRAME_RATE cruft
Conflicts:
libavformat/avformat.h
libavformat/electronicarts.c
libavformat/rawdec.c
libavformat/utils.c
libavformat/version.h
The field is in use and no semantically equivalent field is available,
thus not removed
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 13 Mar 2013 11:43:02 +0000 (12:43 +0100)]
avformat: postpone API removials where the functions are trivial wrapers
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 13 Mar 2013 11:37:03 +0000 (12:37 +0100)]
Merge commit '
7b486ab13bfcfa88a7cd92586de50e49966ec292'
* commit '
7b486ab13bfcfa88a7cd92586de50e49966ec292':
lavf: remove disabled FF_API_AV_GETTIME cruft
lavf: remove disabled FF_API_INTERLEAVE_PACKET cruft
Conflicts:
libavformat/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 13 Mar 2013 11:29:26 +0000 (12:29 +0100)]
Merge commit '
435c2a31ad5eead20eda1152097f60c3bfa22847'
* commit '
435c2a31ad5eead20eda1152097f60c3bfa22847':
lavf: remove disabled FF_API_READ_PACKET cruft
Conflicts:
libavformat/version.h
Removial postponed as wraper is trivial
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 13 Mar 2013 11:21:43 +0000 (12:21 +0100)]
Merge commit '
c7e044c61bb08b3a6e1e8063e8f4449c88b01201'
* commit '
c7e044c61bb08b3a6e1e8063e8f4449c88b01201':
lavf: remove disabled FF_API_APPLEHTTP_PROTO cruft
Conflicts:
libavformat/allformats.c
libavformat/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Paul B Mahol [Wed, 13 Mar 2013 11:12:05 +0000 (11:12 +0000)]
lavc: remove disabled 8SVX_RAW cruft
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Michael Niedermayer [Wed, 13 Mar 2013 11:12:06 +0000 (12:12 +0100)]
Merge commit '
0a7c4daf469d4ac447fb822fe78337f62f4c04e6'
* commit '
0a7c4daf469d4ac447fb822fe78337f62f4c04e6':
lavf: remove disabled FF_API_CLOSE_INPUT_FILE cruft
Conflicts:
libavformat/version.h
removial postponed as the wraper code is trivial
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 13 Mar 2013 11:03:22 +0000 (12:03 +0100)]
Merge commit '
d6ed604cf4ca86ed345125b26eb5bdeea6d6bf68'
* commit '
d6ed604cf4ca86ed345125b26eb5bdeea6d6bf68':
lavc: remove disabled FF_API_IDCT cruft
Conflicts:
libavcodec/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 13 Mar 2013 10:53:57 +0000 (11:53 +0100)]
Merge commit '
3bcdf8dcb9891ffe49b6398d0e2c02f1712d8f00'
* commit '
3bcdf8dcb9891ffe49b6398d0e2c02f1712d8f00':
lavc: remove disabled FF_API_SNOW cruft
Conflicts:
libavcodec/avcodec.h
libavcodec/options_table.h
libavcodec/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Paul B Mahol [Wed, 13 Mar 2013 10:48:09 +0000 (10:48 +0000)]
bktr: add missing #include for av_gettime()
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Janne Grunau [Tue, 12 Mar 2013 21:16:45 +0000 (22:16 +0100)]
avpacket: copy side data type and size in av_dup_packet
Michael Niedermayer [Wed, 13 Mar 2013 10:29:04 +0000 (11:29 +0100)]
Merge commit '
fcb07e8b332bbd6f9558bff98ff5102c5f2d8252'
* commit '
fcb07e8b332bbd6f9558bff98ff5102c5f2d8252':
lavc: remove disabled FF_API_MMI cruft
Conflicts:
libavcodec/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 13 Mar 2013 09:57:00 +0000 (10:57 +0100)]
Revert "Merge commit '
0517c9e098092709397cc522c59fa63c83cc81be'" bring the old audio resampling API back
This reverts commit
d3edc65dd1e5b5d4246fcb8bcd216eb558bab7d4, reversing
changes made to
150de78d7c9cee65b4095832b25ae353e0d7c7af.
Conflicts:
libavcodec/version.h
It seems there are several applications still using it
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 13 Mar 2013 09:51:53 +0000 (10:51 +0100)]
vc1dec: remove unused variables
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Philip Langdale [Wed, 13 Mar 2013 04:53:22 +0000 (21:53 -0700)]
CrystalHD: Port to ref-counted frame API.
Signed-off-by: Philip Langdale <philipl@overt.org>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Loren Merritt [Fri, 21 Sep 2012 23:43:16 +0000 (01:43 +0200)]
hqdn3d: Fix out of array read in LOWPASS
CC:libav-stable@libav.org
Signed-off-by: Anton Khirnov <anton@khirnov.net>
Michael Niedermayer [Sun, 26 Aug 2012 03:44:46 +0000 (05:44 +0200)]
cabac: remove unused argument of ff_init_cabac_states()
Signed-off-by: Anton Khirnov <anton@khirnov.net>
Nicolas George [Sat, 9 Mar 2013 15:47:38 +0000 (16:47 +0100)]
rawdec: fix a typo -- || instead of |
Signed-off-by: Anton Khirnov <anton@khirnov.net>
Clément Bœsch [Thu, 15 Nov 2012 15:11:04 +0000 (17:11 +0200)]
opt: re-enable memleak fix for duplicated options.
The memleak fix in
a1bcc76e was causing problems when the original
string wasn't NULL or av_malloc'ed, thus was disabled. It seems the only
OPT_STRING occurence where it needed to be fixed is in ffserver. This
commit fixes that specific problem and so re-enable the original code.
Michael Niedermayer [Wed, 13 Mar 2013 02:47:16 +0000 (03:47 +0100)]
vp56: remove unused variable
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Ronald S. Bultje [Sun, 10 Mar 2013 21:23:46 +0000 (14:23 -0700)]
dsputil: remove hpel functions (moved to hpeldsp).
Ronald S. Bultje [Sun, 10 Mar 2013 23:53:07 +0000 (16:53 -0700)]
Move alpha half-pel assembly from dsputil to hpeldsp.
Ronald S. Bultje [Sun, 10 Mar 2013 23:51:25 +0000 (16:51 -0700)]
Move sparc/vis half-pel assembly from dsputil to hpeldsp.
Michael Niedermayer [Sun, 10 Mar 2013 23:48:31 +0000 (16:48 -0700)]
Move sh4 half-pel assembly from dsputil to hpeldsp.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Ronald S. Bultje [Sun, 10 Mar 2013 23:40:23 +0000 (16:40 -0700)]
Move bfin half-pel assembly from dsputil to hpeldsp.
Ronald S. Bultje [Sun, 10 Mar 2013 23:16:45 +0000 (16:16 -0700)]
Move arm half-pel assembly from dsputil to hpeldsp.
Ronald S. Bultje [Sun, 10 Mar 2013 22:50:53 +0000 (15:50 -0700)]
Move ppc half-pel assembly from dsputil to hpeldsp.
Ronald S. Bultje [Sun, 10 Mar 2013 22:37:59 +0000 (15:37 -0700)]
Move x86 half-pel assembly from dsputil to hpeldsp.
Ronald S. Bultje [Sun, 10 Mar 2013 21:23:52 +0000 (14:23 -0700)]
mjpeg: use hpeldsp instead of dsputil for half-pel functions.
Ronald S. Bultje [Sun, 10 Mar 2013 21:16:00 +0000 (14:16 -0700)]
svq1enc: use hpeldsp instead of dsputil for half-pel functions.
Ronald S. Bultje [Sun, 10 Mar 2013 21:14:35 +0000 (14:14 -0700)]
snow: use hpeldsp instead of dsputil for half-pel functions.
Ronald S. Bultje [Sun, 10 Mar 2013 21:12:58 +0000 (14:12 -0700)]
svq3: use hpeldsp instead of dsputil for half-pel functions.
Ronald S. Bultje [Sun, 10 Mar 2013 20:55:07 +0000 (13:55 -0700)]
mpegvideo: use hpeldsp instead of dsputil for half-pel functions.
This also converts vc1, since that is mpegvideo-based.