Clément Bœsch
20dab078e6
lavc/crystalhd: remove now unecessary buffer_hints.
2013-03-13 19:00:10 +01:00
Clément Bœsch
1ec94b0f06
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.
2013-03-13 19:00:10 +01:00
Clément Bœsch
e7279638e8
lavfi/thumbnail: remove unecessary poll_frame() callback.
2013-03-13 19:00:10 +01:00
Clément Bœsch
bce2e97a16
lavfi/mptestsrc: raise filter_frame() error.
2013-03-13 19:00:10 +01:00
Clément Bœsch
afa0b90803
lavfi/mandelbrot: raise filter_frame() error.
2013-03-13 19:00:09 +01:00
Clément Bœsch
227a4b63f5
lavfi/life: raise filter_frame() error.
2013-03-13 19:00:09 +01:00
Clément Bœsch
fe6077d902
lavfi/cellauto: raise filter_frame() error.
2013-03-13 19:00:09 +01:00
Clément Bœsch
f32fee570a
lavfi/alphamerge: raise filter_frame() error.
2013-03-13 19:00:09 +01:00
Clément Bœsch
05854f5505
lavfi/movie: raise filter_frame() error.
2013-03-13 19:00:09 +01:00
Clément Bœsch
bdbdadbaff
lavfi/buffersrc: raise filter_frame() error.
2013-03-13 19:00:09 +01:00
Clément Bœsch
27ce858c98
lavfi/showspectrum: raise filter_frame() error.
2013-03-13 19:00:09 +01:00
Clément Bœsch
df5be5e275
lavfi/avfilter: raise filter_frame() error.
2013-03-13 19:00:09 +01:00
Clément Bœsch
60bd8c11b6
lavfi/concat: raise filter_frame() error.
2013-03-13 19:00:09 +01:00
Clément Bœsch
00a13a9cdb
lavfi/anullsrc: raise filter_frame() error.
2013-03-13 19:00:09 +01:00
Clément Bœsch
44f3d21799
lavfi/aevalsrc: raise filter_frame() error.
2013-03-13 19:00:09 +01:00
Clément Bœsch
1b0d0e6b72
lavfi/atempo: raise filter_frame() error.
2013-03-13 19:00:09 +01:00
Clément Bœsch
dda59d9adc
lavfi/asetnsamples: raise filter_frame() error.
2013-03-13 19:00:08 +01:00
Clément Bœsch
c82bb2815b
lavfi/aresample: raise filter_frame() error.
2013-03-13 19:00:08 +01:00
Hendrik Leppkes
e4c5e08f60
lavu/frame: av_frame_make_writable: set the channels on the new frame.
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-03-13 16:00:43 +01:00
Hendrik Leppkes
2035cc3595
lavu/frame: copy all frame properties in av_frame_copy_props
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-03-13 16:00:28 +01:00
Hendrik Leppkes
9ae6ba2883
dsputil: remove deprecated dsp_mask usage
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-03-13 15:59:35 +01:00
Michael Niedermayer
c3bb2f7296
dsputil_mmx: remove unused variables
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-03-13 15:07:46 +01:00
Michael Niedermayer
7ff3bfd584
exr: silence warning "libavcodec/exr.c:351:9: warning: variable ret set but not used"
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-03-13 15:05:40 +01:00
Michael Niedermayer
c31f07574d
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>
2013-03-13 14:49:00 +01:00
Michael Niedermayer
11d62fc9be
Merge commit '37cb3b180a1dc3d6f123f68e0806585ebc2578b6'
...
* commit '37cb3b180a1dc3d6f123f68e0806585ebc2578b6':
matroskadec: request a read buffer for the wav header
See: d0b450457b
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-03-13 14:44:14 +01:00
Michael Niedermayer
019b378d90
vc1: fix int/ptrdiff_t mismatches
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-03-13 14:35:48 +01:00
Michael Niedermayer
db4e4f766c
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>
2013-03-13 14:18:53 +01:00
Michael Niedermayer
849f015406
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>
2013-03-13 14:03:22 +01:00
Michael Niedermayer
a62fced394
Merge commit '202c2acc40a6de8758b44ab3f5c85ab250079734'
...
* commit '202c2acc40a6de8758b44ab3f5c85ab250079734':
vda: remove async decoder leftovers
Conflicts:
libavcodec/vda_h264.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-03-13 13:53:02 +01:00
Michael Niedermayer
bb3823d457
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>
2013-03-13 13:45:50 +01:00
Michael Niedermayer
8ded1718bd
Merge commit 'fce68c93554803801c32c1b20509bfa8d496b02a'
...
* commit 'fce68c93554803801c32c1b20509bfa8d496b02a':
pthread: unref the decoded but not returned frames on close.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-03-13 13:39:44 +01:00
Michael Niedermayer
8bcebf9e4a
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>
2013-03-13 13:34:06 +01:00
Michael Niedermayer
87d263a122
Merge commit 'c2597c5a0a08526493abb9bc9544b61a290fe20f'
...
* commit 'c2597c5a0a08526493abb9bc9544b61a290fe20f':
h264_refs: cosmetics, reformat
Conflicts:
libavcodec/h264_refs.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-03-13 13:28:29 +01:00
Michael Niedermayer
6c3e4e391d
Merge commit 'f08fefc4d099f2a1f2e3a6db3d340537e601f762'
...
* commit 'f08fefc4d099f2a1f2e3a6db3d340537e601f762':
h264: remove a useless svq3 condition
mpegvideo: remove FMT_H264
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-03-13 13:17:49 +01:00
Michael Niedermayer
72ad824a86
Merge remote-tracking branch 'cehoyos/master'
...
* cehoyos/master:
avframe: Copy buffer type in copy_props.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-03-13 13:12:11 +01:00
Michael Niedermayer
df4517106a
Merge commit 'ee8704916de79158da8a48a9ea5be819e83d23ba'
...
* commit 'ee8704916de79158da8a48a9ea5be819e83d23ba':
mpegvideo: reindent
Conflicts:
libavcodec/mpegvideo.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-03-13 13:08:04 +01:00
Carl Eugen Hoyos
f1b716c79b
avframe: Copy buffer type in copy_props.
...
Fixes VDPAU decoding with MPlayer.
2013-03-13 13:05:42 +01:00
Michael Niedermayer
f45fdb123f
Merge commit '19cac8e301419dcde31526d15196a952ddf2c4c7'
...
* commit '19cac8e301419dcde31526d15196a952ddf2c4c7':
mpegvideo: remove useless references to h264 and svq3
Conflicts:
libavcodec/mpegvideo.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-03-13 12:56:43 +01:00
Michael Niedermayer
b2e0c9dd34
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>
2013-03-13 12:55:00 +01:00
Michael Niedermayer
acbd14bc7e
avformat: postpone API removials where the functions are trivial wrapers
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-03-13 12:43:02 +01:00
Michael Niedermayer
06a8350599
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>
2013-03-13 12:37:03 +01:00
Michael Niedermayer
256e1f7bdf
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>
2013-03-13 12:34:06 +01:00
Michael Niedermayer
1c60956c80
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>
2013-03-13 12:21:43 +01:00
Paul B Mahol
ac45921a6b
lavc: remove disabled 8SVX_RAW cruft
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-03-13 11:17:09 +00:00
Michael Niedermayer
ed80427e0e
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>
2013-03-13 12:18:06 +01:00
Michael Niedermayer
b13cd2d867
Merge commit 'd6ed604cf4ca86ed345125b26eb5bdeea6d6bf68'
...
* commit 'd6ed604cf4ca86ed345125b26eb5bdeea6d6bf68':
lavc: remove disabled FF_API_IDCT cruft
Conflicts:
libavcodec/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-03-13 12:03:22 +01:00
Michael Niedermayer
feccf2f6b7
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>
2013-03-13 11:53:57 +01:00
Paul B Mahol
b3b46cd74e
bktr: add missing #include for av_gettime()
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-03-13 10:48:09 +00:00
Janne Grunau
91d4823f70
avpacket: copy side data type and size in av_dup_packet
2013-03-13 11:34:47 +01:00
Michael Niedermayer
5753e34906
Merge commit 'fcb07e8b332bbd6f9558bff98ff5102c5f2d8252'
...
* commit 'fcb07e8b332bbd6f9558bff98ff5102c5f2d8252':
lavc: remove disabled FF_API_MMI cruft
Conflicts:
libavcodec/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-03-13 11:29:04 +01:00