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.
2013-03-13 07:25:16 +01:00
Michael Niedermayer
12fe78a77b
vp56: remove unused variable
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-03-13 04:12:14 +01:00
Ronald S. Bultje
f536df99fe
dsputil: remove hpel functions (moved to hpeldsp).
2013-03-13 04:11:41 +01:00
Ronald S. Bultje
94b77678dc
Move alpha half-pel assembly from dsputil to hpeldsp.
2013-03-13 04:11:27 +01:00
Ronald S. Bultje
6802c70106
Move sparc/vis half-pel assembly from dsputil to hpeldsp.
2013-03-13 04:09:43 +01:00
Michael Niedermayer
a0565a2b65
Move sh4 half-pel assembly from dsputil to hpeldsp.
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-03-13 04:07:41 +01:00
Ronald S. Bultje
e9e608ad58
Move bfin half-pel assembly from dsputil to hpeldsp.
2013-03-13 04:06:10 +01:00
Ronald S. Bultje
de99545f46
Move arm half-pel assembly from dsputil to hpeldsp.
2013-03-13 04:04:13 +01:00
Ronald S. Bultje
89f16ded9b
Move ppc half-pel assembly from dsputil to hpeldsp.
2013-03-13 04:02:30 +01:00
Ronald S. Bultje
3ced55d51c
Move x86 half-pel assembly from dsputil to hpeldsp.
2013-03-13 03:59:23 +01:00
Ronald S. Bultje
e0a8f31591
mjpeg: use hpeldsp instead of dsputil for half-pel functions.
2013-03-13 03:59:10 +01:00
Ronald S. Bultje
b42d594c85
svq1enc: use hpeldsp instead of dsputil for half-pel functions.
2013-03-13 03:59:00 +01:00
Ronald S. Bultje
771ba8f206
snow: use hpeldsp instead of dsputil for half-pel functions.
2013-03-13 03:58:49 +01:00
Ronald S. Bultje
05dd583426
svq3: use hpeldsp instead of dsputil for half-pel functions.
2013-03-13 03:58:31 +01:00
Ronald S. Bultje
4ba5dbc0e4
mpegvideo: use hpeldsp instead of dsputil for half-pel functions.
...
This also converts vc1, since that is mpegvideo-based.
2013-03-13 03:58:00 +01:00
Ronald S. Bultje
4652389777
svq1: use hpeldsp instead of dsputil for half-pel functions.
...
This makes svq1 independent of dsputil.
2013-03-13 03:57:45 +01:00
Ronald S. Bultje
cc5d17e026
mimic: use hpeldsp instead of dsputil for half-pel functions.
2013-03-13 03:57:33 +01:00
Ronald S. Bultje
04a75bb74f
interplayvideo: use hpeldsp instead of dsputil for half-pel functions.
...
This makes interplayvideo independent of dsputil.
2013-03-13 03:57:21 +01:00
Ronald S. Bultje
af1e3dfb9e
bink: use hpeldsp instead of dsputil for half-pel functions.
2013-03-13 03:56:09 +01:00
Ronald S. Bultje
4b642ab19b
indeo3: use hpeldsp instead of dsputil for half-pel functions.
...
This makes indeo3 independent of dsputil.
2013-03-13 03:56:09 +01:00
Ronald S. Bultje
704c9874a3
vp56: use hpeldsp instead of dsputil for half-pel functions.
...
This makes vp5 and vp6 independent of dsputil.
2013-03-13 03:56:07 +01:00
Ronald S. Bultje
d1293512cf
vp3: use hpeldsp instead of dsputil for half-pel functions.
...
This makes vp3 independent of dsputil.
2013-03-13 03:55:33 +01:00
Ronald S. Bultje
9628e5a4ac
hpeldsp: add half-pel functions (currently copies of dsputil).
2013-03-13 03:54:47 +01:00
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>
2013-03-13 02:56:33 +01:00
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>
2013-03-13 02:41:18 +01:00
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>
2013-03-13 02:08:41 +01:00
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>
2013-03-13 02:02:06 +01:00
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>
2013-03-13 01:56:41 +01:00
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>
2013-03-13 01:47:39 +01:00
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.
2013-03-13 01:30:20 +01:00
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>
2013-03-13 01:31:46 +01:00
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>
2013-03-13 01:14:09 +01:00
Michael Niedermayer
cfc1efc77c
avcodec: assert that old codec ids match new
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-03-13 00:50:48 +01:00
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>
2013-03-13 00:49:25 +01:00
Stefano Sabatini
aeac1dae29
lavfi/fieldorder: add support to named options
2013-03-13 00:37:13 +01:00
Stefano Sabatini
a3233e9d7a
lavfi/fieldorder: remove unused headers and commented define
2013-03-13 00:34:51 +01:00
Stefano Sabatini
92ca292766
lavc: extend documentation for skip_idct, skip_loop_filter, skip_frame options
2013-03-13 00:34:42 +01:00
Stefano Sabatini
1019cef329
ffprobe: support codec options
...
Make ffprobe honour codec options, and support stream specifiers like it
is done in ffplay.
In particular, address Trac ticket #1859 .
2013-03-13 00:34:36 +01:00
Stefano Sabatini
8bb5680d90
cmdutils: improve feedback in case of not found option
2013-03-13 00:34:29 +01:00
Nicolas George
684a264638
configure: remove selection of ff(a)buffersink.
...
buffersink is enabled unconditionally.
2013-03-12 23:31:07 +01:00
Nicolas George
c14a8c834c
lavfi/buffersink: schedule removing the "ff" variants.
...
They are no longer needed since there is no incompatible
ABI version.
2013-03-12 23:31:07 +01:00
Nicolas George
ceac5c54dd
Remove references to the "ff" variant of buffersink.
2013-03-12 23:31:07 +01:00
Nicolas George
9a2688826d
lavfi/buffersink: rename filter structures.
...
Reduce the diff with the fork.
2013-03-12 23:31:07 +01:00
Michael Niedermayer
f7b041b11b
Merge commit '7d42fd6bb9df99a20cf2d0d0e3b166a83a649d08'
...
* commit '7d42fd6bb9df99a20cf2d0d0e3b166a83a649d08':
lavc: remove disabled FF_API_FIND_BEST_PIX_FMT cruft
Conflicts:
libavcodec/avcodec.h
libavcodec/imgconvert.c
libavcodec/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-03-12 23:08:08 +01:00
Ronald S. Bultje
d85c9b036e
vp3/x86: use full transpose for all IDCTs.
...
This way, the special IDCT permutations are no longer needed. Bfin code
is disabled until someone updates it. This is similar to how H264 does
it, and removes the dsputil dependency imposed by the scantable code.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-03-12 22:54:10 +01:00
Michael Niedermayer
db594f65ec
Merge commit '845017105f240ac5348aad1f8a5256b86d49db76'
...
* commit '845017105f240ac5348aad1f8a5256b86d49db76':
lavc: remove disabled FF_API_DSP_MASK cruft
lavc: remove disabled FF_API_SUB_ID cruft
Conflicts:
libavcodec/options_table.h
libavcodec/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-03-12 22:38:55 +01:00
Michael Niedermayer
5beddbc4cf
Merge commit '2a113695238e7675ab75c5fb9a5f59fc92f2ddd9'
...
* commit '2a113695238e7675ab75c5fb9a5f59fc92f2ddd9':
lavc: remove disabled FF_API_INTER_THRESHOLD cruft
lavc: remove disabled FF_API_COLOR_TABLE_ID cruft
lavc: remove disabled FF_API_MPV_GLOBAL_OPTS cruft
Conflicts:
libavcodec/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-03-12 22:18:08 +01:00
Michael Niedermayer
e052f06531
Merge commit '0f24a3ca999a702f83af9307f9f47b6fdeb546a5'
...
* commit '0f24a3ca999a702f83af9307f9f47b6fdeb546a5':
lavc: remove disabled FF_API_OLD_ENCODE_VIDEO cruft
lavc: remove disabled FF_API_OLD_ENCODE_AUDIO cruft
lavc: remove disabled FF_API_OLD_DECODE_AUDIO cruft
Conflicts:
libavcodec/flacenc.c
libavcodec/libgsm.c
libavcodec/utils.c
libavcodec/version.h
The compatibility wrapers are left as they likely sre still
in wide use. They will be removed when they break or otherwise
cause work without an volunteer being available.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-03-12 22:04:16 +01:00
Michael Niedermayer
eba6a04e1c
vp6: remove unused variable
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-03-12 21:46:38 +01:00
Michael Niedermayer
2ec30267fe
Changelog: fix project name
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-03-12 21:45:51 +01:00