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>
12 years ago
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>
12 years ago
Paul B Mahol
ac45921a6b
lavc: remove disabled 8SVX_RAW cruft
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
12 years ago
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>
12 years ago
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>
12 years ago
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>
12 years ago
Paul B Mahol
b3b46cd74e
bktr: add missing #include for av_gettime()
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
12 years ago
Janne Grunau
91d4823f70
avpacket: copy side data type and size in av_dup_packet
12 years ago
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>
12 years ago
Michael Niedermayer
a8c0777325
Revert "Merge commit '0517c9e098092709397cc522c59fa63c83cc81be'" bring the old audio resampling API back
...
This reverts commit d3edc65dd1
, reversing
changes made to 150de78d7c
.
Conflicts:
libavcodec/version.h
It seems there are several applications still using it
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years ago
Michael Niedermayer
bbaa4432e2
vc1dec: remove unused variables
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years ago
Philip Langdale
21dc9b194f
CrystalHD: Port to ref-counted frame API.
...
Signed-off-by: Philip Langdale <philipl@overt.org>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years ago
Loren Merritt
5b3c1aecb2
hqdn3d: Fix out of array read in LOWPASS
...
CC:libav-stable@libav.org
Signed-off-by: Anton Khirnov <anton@khirnov.net>
12 years ago
Michael Niedermayer
0fe4b48540
cabac: remove unused argument of ff_init_cabac_states()
...
Signed-off-by: Anton Khirnov <anton@khirnov.net>
12 years ago
Nicolas George
be40d6cc2b
rawdec: fix a typo -- || instead of |
...
Signed-off-by: Anton Khirnov <anton@khirnov.net>
12 years ago
Clément Bœsch
19c41c6d8e
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.
12 years ago
Michael Niedermayer
12fe78a77b
vp56: remove unused variable
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years ago
Ronald S. Bultje
f536df99fe
dsputil: remove hpel functions (moved to hpeldsp).
12 years ago
Ronald S. Bultje
94b77678dc
Move alpha half-pel assembly from dsputil to hpeldsp.
12 years ago
Ronald S. Bultje
6802c70106
Move sparc/vis half-pel assembly from dsputil to hpeldsp.
12 years ago
Michael Niedermayer
a0565a2b65
Move sh4 half-pel assembly from dsputil to hpeldsp.
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years ago
Ronald S. Bultje
e9e608ad58
Move bfin half-pel assembly from dsputil to hpeldsp.
12 years ago
Ronald S. Bultje
de99545f46
Move arm half-pel assembly from dsputil to hpeldsp.
12 years ago
Ronald S. Bultje
89f16ded9b
Move ppc half-pel assembly from dsputil to hpeldsp.
12 years ago
Ronald S. Bultje
3ced55d51c
Move x86 half-pel assembly from dsputil to hpeldsp.
12 years ago
Ronald S. Bultje
e0a8f31591
mjpeg: use hpeldsp instead of dsputil for half-pel functions.
12 years ago
Ronald S. Bultje
b42d594c85
svq1enc: use hpeldsp instead of dsputil for half-pel functions.
12 years ago
Ronald S. Bultje
771ba8f206
snow: use hpeldsp instead of dsputil for half-pel functions.
12 years ago
Ronald S. Bultje
05dd583426
svq3: use hpeldsp instead of dsputil for half-pel functions.
12 years ago
Ronald S. Bultje
4ba5dbc0e4
mpegvideo: use hpeldsp instead of dsputil for half-pel functions.
...
This also converts vc1, since that is mpegvideo-based.
12 years ago
Ronald S. Bultje
4652389777
svq1: use hpeldsp instead of dsputil for half-pel functions.
...
This makes svq1 independent of dsputil.
12 years ago
Ronald S. Bultje
cc5d17e026
mimic: use hpeldsp instead of dsputil for half-pel functions.
12 years ago
Ronald S. Bultje
04a75bb74f
interplayvideo: use hpeldsp instead of dsputil for half-pel functions.
...
This makes interplayvideo independent of dsputil.
12 years ago
Ronald S. Bultje
af1e3dfb9e
bink: use hpeldsp instead of dsputil for half-pel functions.
12 years ago
Ronald S. Bultje
4b642ab19b
indeo3: use hpeldsp instead of dsputil for half-pel functions.
...
This makes indeo3 independent of dsputil.
12 years ago
Ronald S. Bultje
704c9874a3
vp56: use hpeldsp instead of dsputil for half-pel functions.
...
This makes vp5 and vp6 independent of dsputil.
12 years ago
Ronald S. Bultje
d1293512cf
vp3: use hpeldsp instead of dsputil for half-pel functions.
...
This makes vp3 independent of dsputil.
12 years ago
Ronald S. Bultje
9628e5a4ac
hpeldsp: add half-pel functions (currently copies of dsputil).
12 years ago
Michael Niedermayer
1f27053b91
Merge commit 'de27d2b92fa97deb2856d18e9f5f19586ce45a0f'
...
* commit 'de27d2b92fa97deb2856d18e9f5f19586ce45a0f':
lavc: remove disabled FF_API_LIBMPEG2 cruft
Conflicts:
libavcodec/avcodec.h
libavcodec/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
12 years ago
Michael Niedermayer
d3edc65dd1
Merge commit '0517c9e098092709397cc522c59fa63c83cc81be'
...
* commit '0517c9e098092709397cc522c59fa63c83cc81be':
lavc: remove disabled FF_API_AVCODEC_RESAMPLE cruft
Conflicts:
libavcodec/Makefile
libavcodec/avcodec.h
libavcodec/resample.c
libavcodec/resample2.c
libavcodec/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
12 years ago
Michael Niedermayer
150de78d7c
Merge commit 'd6d369bf1370999896500ae7eb5b9447ab635a3d'
...
* commit 'd6d369bf1370999896500ae7eb5b9447ab635a3d':
atomic: prefer gcc builtins over win32 atomics, if available.
avframe: copy reordered_opaque in copy_props
Conflicts:
libavutil/frame.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
12 years ago
Michael Niedermayer
e5949cc12a
Merge commit '684e3d2e1ce96625eeef63f2564aab66f6715d05'
...
* commit '684e3d2e1ce96625eeef63f2564aab66f6715d05':
ra144: check buffer size before requesting a buffer
wmapro: unref skipped frames
Merged-by: Michael Niedermayer <michaelni@gmx.at>
12 years ago
Michael Niedermayer
ff3e8564c4
Merge commit 'e3232f34312f8187094c875445683277ed0c209d'
...
* commit 'e3232f34312f8187094c875445683277ed0c209d':
svq1: use av_frame_free to free refcounted frame
lavc: fix get_buffer() compatibility layer for audio.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
12 years ago
Michael Niedermayer
047c5e177a
Merge commit '98cec5c84feff34e04428de4a86836a83657ae5e'
...
* commit '98cec5c84feff34e04428de4a86836a83657ae5e':
ratecontrol: remove an unused variable
vorbisdec: do not leak the first frame.
vf_pad: fix a & instead of && typo
Conflicts:
libavfilter/vf_pad.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
12 years ago
Clément Bœsch
02a6b06d9e
avpacket: do not copy data when buf ref is available.
...
This at least fixes issues with lavf/subtitles. The behaviour of
av_dup_packet() is unchanged, only av_copy_packet() is affected.
12 years ago
Michael Niedermayer
b94df21a51
Merge commit '2eaa3663fda750dac66d41fe8541a8744d5563a4'
...
* commit '2eaa3663fda750dac66d41fe8541a8744d5563a4':
avplay: enable only when SDL 1.2 is found
Conflicts:
configure
Merged-by: Michael Niedermayer <michaelni@gmx.at>
12 years ago
Michael Niedermayer
d469fa1923
Merge commit 'adfa53d67c7a3318157ea9d95e8bdcfb77139452'
...
* commit 'adfa53d67c7a3318157ea9d95e8bdcfb77139452':
lavc: remove disabled FF_API_VDA_ASYNC cruft
Conflicts:
libavcodec/vda.h
libavcodec/vda_h264.c
libavcodec/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
12 years ago
Michael Niedermayer
cfc1efc77c
avcodec: assert that old codec ids match new
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years ago
Michael Niedermayer
e664f48b97
Merge commit 'bdd1567c355a8092e7746ef99e831d579e34fa6a'
...
* commit 'bdd1567c355a8092e7746ef99e831d579e34fa6a':
lavc: remove disabled FF_API_CODEC_ID cruft
Conflicts:
libavcodec/old_codec_ids.h
libavcodec/version.h
Only the #define is removed
The CODEC_IDs itself are left until theres some reason to remove
them.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
12 years ago
Stefano Sabatini
aeac1dae29
lavfi/fieldorder: add support to named options
12 years ago