]>
git.sesse.net Git - ffmpeg/log
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>
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>
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.
Ronald S. Bultje [Sun, 10 Mar 2013 20:38:45 +0000 (13:38 -0700)]
svq1: use hpeldsp instead of dsputil for half-pel functions.
This makes svq1 independent of dsputil.
Ronald S. Bultje [Sun, 10 Mar 2013 20:32:10 +0000 (13:32 -0700)]
mimic: use hpeldsp instead of dsputil for half-pel functions.
Ronald S. Bultje [Sun, 10 Mar 2013 19:58:02 +0000 (12:58 -0700)]
interplayvideo: use hpeldsp instead of dsputil for half-pel functions.
This makes interplayvideo independent of dsputil.
Ronald S. Bultje [Sun, 10 Mar 2013 16:12:01 +0000 (09:12 -0700)]
bink: use hpeldsp instead of dsputil for half-pel functions.
Ronald S. Bultje [Sun, 10 Mar 2013 15:19:27 +0000 (08:19 -0700)]
indeo3: use hpeldsp instead of dsputil for half-pel functions.
This makes indeo3 independent of dsputil.
Ronald S. Bultje [Sun, 10 Mar 2013 13:55:58 +0000 (06:55 -0700)]
vp56: use hpeldsp instead of dsputil for half-pel functions.
This makes vp5 and vp6 independent of dsputil.
Ronald S. Bultje [Sun, 10 Mar 2013 05:26:09 +0000 (21:26 -0800)]
vp3: use hpeldsp instead of dsputil for half-pel functions.
This makes vp3 independent of dsputil.
Ronald S. Bultje [Sat, 9 Mar 2013 23:14:35 +0000 (15:14 -0800)]
hpeldsp: add half-pel functions (currently copies of dsputil).
Michael Niedermayer [Wed, 13 Mar 2013 01:56:33 +0000 (02:56 +0100)]
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>
Michael Niedermayer [Wed, 13 Mar 2013 01:41:18 +0000 (02:41 +0100)]
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>
Michael Niedermayer [Wed, 13 Mar 2013 01:08:41 +0000 (02:08 +0100)]
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>
Michael Niedermayer [Wed, 13 Mar 2013 01:02:00 +0000 (02:02 +0100)]
Merge commit '
684e3d2e1ce96625eeef63f2564aab66f6715d05 '
* commit '
684e3d2e1ce96625eeef63f2564aab66f6715d05 ':
ra144: check buffer size before requesting a buffer
wmapro: unref skipped frames
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 13 Mar 2013 00:55:08 +0000 (01:55 +0100)]
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>
Michael Niedermayer [Wed, 13 Mar 2013 00:47:39 +0000 (01:47 +0100)]
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>
Clément Bœsch [Tue, 12 Mar 2013 07:13:21 +0000 (08:13 +0100)]
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.
Michael Niedermayer [Wed, 13 Mar 2013 00:31:46 +0000 (01:31 +0100)]
Merge commit '
2eaa3663fda750dac66d41fe8541a8744d5563a4 '
* commit '
2eaa3663fda750dac66d41fe8541a8744d5563a4 ':
avplay: enable only when SDL 1.2 is found
Conflicts:
configure
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 13 Mar 2013 00:12:57 +0000 (01:12 +0100)]
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>
Michael Niedermayer [Tue, 12 Mar 2013 23:39:05 +0000 (00:39 +0100)]
avcodec: assert that old codec ids match new
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 12 Mar 2013 23:48:58 +0000 (00:48 +0100)]
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>
Stefano Sabatini [Sun, 10 Mar 2013 16:36:29 +0000 (17:36 +0100)]
lavfi/fieldorder: add support to named options
Stefano Sabatini [Sun, 10 Mar 2013 16:35:54 +0000 (17:35 +0100)]
lavfi/fieldorder: remove unused headers and commented define
Stefano Sabatini [Sun, 10 Mar 2013 15:15:48 +0000 (16:15 +0100)]
lavc: extend documentation for skip_idct, skip_loop_filter, skip_frame options
Stefano Sabatini [Wed, 6 Mar 2013 23:47:59 +0000 (00:47 +0100)]
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.
Stefano Sabatini [Sun, 10 Mar 2013 14:36:20 +0000 (15:36 +0100)]
cmdutils: improve feedback in case of not found option
Nicolas George [Mon, 11 Mar 2013 20:51:05 +0000 (21:51 +0100)]
configure: remove selection of ff(a)buffersink.
buffersink is enabled unconditionally.
Nicolas George [Mon, 11 Mar 2013 20:49:28 +0000 (21:49 +0100)]
lavfi/buffersink: schedule removing the "ff" variants.
They are no longer needed since there is no incompatible
ABI version.
Nicolas George [Mon, 11 Mar 2013 20:49:04 +0000 (21:49 +0100)]
Remove references to the "ff" variant of buffersink.
Nicolas George [Mon, 11 Mar 2013 20:26:03 +0000 (21:26 +0100)]
lavfi/buffersink: rename filter structures.
Reduce the diff with the fork.
Michael Niedermayer [Tue, 12 Mar 2013 22:08:08 +0000 (23:08 +0100)]
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>
Ronald S. Bultje [Tue, 12 Mar 2013 14:28:12 +0000 (07:28 -0700)]
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>
Michael Niedermayer [Tue, 12 Mar 2013 21:38:55 +0000 (22:38 +0100)]
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>
Michael Niedermayer [Tue, 12 Mar 2013 21:18:08 +0000 (22:18 +0100)]
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>
Michael Niedermayer [Tue, 12 Mar 2013 21:04:16 +0000 (22:04 +0100)]
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>
Michael Niedermayer [Tue, 12 Mar 2013 20:46:38 +0000 (21:46 +0100)]
vp6: remove unused variable
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 12 Mar 2013 20:45:51 +0000 (21:45 +0100)]
Changelog: fix project name
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 12 Mar 2013 20:39:32 +0000 (21:39 +0100)]
Merge commit '
6327c10702922eabcb1c6170abd3f03d23ce4c51 '
* commit '
6327c10702922eabcb1c6170abd3f03d23ce4c51 ':
atomic: fix CAS with armcc.
png: use av_mallocz_array() for the zlib zalloc function
libmp3lame: use the correct remaining buffer size when flushing
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 12 Mar 2013 20:26:13 +0000 (21:26 +0100)]
Merge commit '
666fe5da47d127074be7f0e2bac93db6af8b4a30 '
* commit '
666fe5da47d127074be7f0e2bac93db6af8b4a30 ':
atomic: Exclude the unsupported implementation headers from checkheaders
avconv: do not silently ignore unused codec AVOptions.
Conflicts:
ffmpeg_opt.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 12 Mar 2013 20:23:54 +0000 (21:23 +0100)]
avfilter: remove unused variable
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 12 Mar 2013 20:15:18 +0000 (21:15 +0100)]
Merge commit '
db2d65ce1ed13ea9a530b1934963a16c3e8fa460 '
* commit '
db2d65ce1ed13ea9a530b1934963a16c3e8fa460 ':
avconv: fix a typo
FATE: replace -vb with -b:v
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 12 Mar 2013 20:06:30 +0000 (21:06 +0100)]
Merge commit '
6deae8e0530a885b76f149841ed4899cb438ec23 '
* commit '
6deae8e0530a885b76f149841ed4899cb438ec23 ':
FATE: remove the -dct option from some decoding tests.
avconv: use a local variable for InputFile in open_input_file().
Conflicts:
tests/fate/microsoft.mak
tests/fate/real.mak
tests/fate/video.mak
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 12 Mar 2013 19:58:45 +0000 (20:58 +0100)]
Merge commit '
1da54e908eba73eb86f5d614c51f06811c85c3ea '
* commit '
1da54e908eba73eb86f5d614c51f06811c85c3ea ':
avconv: use a local variable for OutputFile in open_output_file().
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Hendrik Leppkes [Tue, 12 Mar 2013 19:33:13 +0000 (20:33 +0100)]
vorbis: unref the skipped first frame.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Hendrik Leppkes [Tue, 12 Mar 2013 15:45:13 +0000 (16:45 +0100)]
avutil/os_support: use 64-bit fstat/lseek variants for MSVC as well
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Ronald S. Bultje [Tue, 12 Mar 2013 14:28:11 +0000 (07:28 -0700)]
dsputil: make selectable.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 12 Mar 2013 17:58:10 +0000 (18:58 +0100)]
ffmpeg: remove unused variable
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 12 Mar 2013 17:43:17 +0000 (18:43 +0100)]
h264: show recovery SEIs in debug output
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 12 Mar 2013 17:30:59 +0000 (18:30 +0100)]
j2kdec: remove unused variable and empty function
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Hendrik Leppkes [Tue, 12 Mar 2013 16:02:57 +0000 (17:02 +0100)]
jv: initialize AVFrame
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 12 Mar 2013 17:18:56 +0000 (18:18 +0100)]
ffmpeg: fix reinit_filter type
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 12 Mar 2013 17:10:35 +0000 (18:10 +0100)]
Merge commit '
9d3009c6c4b9b6734f07df7c88f6a42ded6cdf38 '
* commit '
9d3009c6c4b9b6734f07df7c88f6a42ded6cdf38 ':
avconv: print an error on applying options of the wrong type.
atomic: Check for __sync_val_compare_and_swap instead of __sync_synchronize
output-example: Update to use encode_video2 instead of the now dropped encode_video
Conflicts:
doc/examples/muxing.c
ffmpeg_opt.c
libavutil/atomic.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 12 Mar 2013 15:43:06 +0000 (16:43 +0100)]
pthread: fix unused variable warning
Giorgio Vazzana [Mon, 11 Mar 2013 15:39:52 +0000 (16:39 +0100)]
lavd/v4l2: fix bug in init_convert_timestamp()
The current code returned a period=0, resulting in identical pts for all frames
after time-filtering. This is because AV_TIME_BASE_Q={1, AV_TIME_BASE} and
not {AV_TIME_BASE, 1}. With this patch the correct period in microseconds is computed.
Michael Niedermayer [Tue, 12 Mar 2013 15:36:21 +0000 (16:36 +0100)]
Merge commit '
2240e92f052960693de55cf4924e80426dfaa965 '
* commit '
2240e92f052960693de55cf4924e80426dfaa965 ':
atomic: Add include guards to the implementation headers
lavc: update the fallback versions of ff_thread_*
Conflicts:
libavcodec/utils.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 12 Mar 2013 15:31:21 +0000 (16:31 +0100)]
Merge commit '
19dd4017ab6dac11c77d797acebee4f60ad63a6f '
* commit '
19dd4017ab6dac11c77d797acebee4f60ad63a6f ':
libopencore-amr: Add the missing 3rd argument of ff_get_buffer()
vmdaudio: fix invalid reads when packet size is not a multiple of chunk size
wmaprodec: return an error, not 0, when the input is too small.
Conflicts:
libavcodec/vmdav.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Nicolas George [Tue, 12 Mar 2013 14:56:52 +0000 (15:56 +0100)]
lavf: add AV_ to two remaining CODEC_ID_*.
Michael Niedermayer [Tue, 12 Mar 2013 15:15:08 +0000 (16:15 +0100)]
Merge commit '
cacad1c058f66558ec727faac3b277d2dee264d4 '
* commit '
cacad1c058f66558ec727faac3b277d2dee264d4 ':
wmaprodec: require block_align to be set.
wmadec: require block_align to be set.
ivi_common: do not call MC for intra frames when dc_transform is unset
Conflicts:
libavcodec/ivi_common.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 12 Mar 2013 15:04:46 +0000 (16:04 +0100)]
xface: remove unused stuff, fix related warnings
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 12 Mar 2013 14:57:23 +0000 (15:57 +0100)]
Merge commit '
3e2f200237af977b9253b0aff121eee27bcedb44 '
* commit '
3e2f200237af977b9253b0aff121eee27bcedb44 ':
roqvideodec: fix a potential infinite loop in roqvideo_decode_frame().
xxan: fix invalid memory access in xan_decode_frame_type0()
tty: set avg_frame_rate.
FATE: enable multiple slices in the ffv1 vsynth test
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 12 Mar 2013 14:51:22 +0000 (15:51 +0100)]
Merge commit '
d243896987b8b2062d1faba4d8d6f0c62d2dbee9 '
* commit '
d243896987b8b2062d1faba4d8d6f0c62d2dbee9 ':
ffv1: fix calculating slice dimensions for version 2
Conflicts:
libavcodec/ffv1dec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 12 Mar 2013 14:44:15 +0000 (15:44 +0100)]
Merge commit '
7b89cd20d844cbe763ca34e63e99d110043cf241 '
* commit '
7b89cd20d844cbe763ca34e63e99d110043cf241 ':
eamad: allocate a dummy reference frame when the real one is missing
Replace remaining includes of audioconvert.h with channel_layout.h
Replace some forgotten instances of PIX_FMT_* with AV_PIX_FMT_*.
Conflicts:
libavcodec/h264.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 12 Mar 2013 14:29:20 +0000 (15:29 +0100)]
Merge commit '
d8b31be6caebd8d1321ecb754b6e7daaf81dc111 '
* commit '
d8b31be6caebd8d1321ecb754b6e7daaf81dc111 ':
Add the bumps and APIchanges entries for reference counted buffers changes.
Conflicts:
Changelog
doc/APIchanges
libavcodec/version.h
libavdevice/version.h
libavfilter/version.h
libavformat/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 12 Mar 2013 14:26:35 +0000 (15:26 +0100)]
avformat: keep r_frame_rate
This field is used and nothing equivalent exists
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 12 Mar 2013 14:25:59 +0000 (15:25 +0100)]
avformat/avdevice: add missing time.h includes
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 12 Mar 2013 14:25:21 +0000 (15:25 +0100)]
avcodec: postpone removial of parts still used
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 12 Mar 2013 13:46:29 +0000 (14:46 +0100)]
Merge commit '
8df23e938b4022d6e6e9e1180ea6418abae74fda '
* commit '
8df23e938b4022d6e6e9e1180ea6418abae74fda ':
lavc: postpone the removal of request_channels API.
AVFrame: deprecate all now unused fields
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 12 Mar 2013 13:27:45 +0000 (14:27 +0100)]
Merge commit '
ddcca4ba074aa537c3059c76d69eb4ad6316bfe9 '
* commit '
ddcca4ba074aa537c3059c76d69eb4ad6316bfe9 ':
lavc: stop setting AVFrame.motion_subsample_log2
avserver: don't set deprecated options.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 12 Mar 2013 12:40:42 +0000 (13:40 +0100)]
Merge commit '
354468fc12dcf93e7fb4af552e18906771913273 '
* commit '
354468fc12dcf93e7fb4af552e18906771913273 ':
avplay: switch to new refcounted frames API
avconv: convert to new refcounted AVFrame API
Conflicts:
cmdutils.c
ffmpeg.c
ffmpeg.h
ffplay.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 12 Mar 2013 11:57:54 +0000 (12:57 +0100)]
Merge commit '
37045e422903695e610cca6ecb753df643ab9380 '
* commit '
37045e422903695e610cca6ecb753df643ab9380 ':
mpegvideo: drop vismv code
Conflicts:
libavcodec/mpegvideo.c
vismv code works fine, and thus only the unused fields are droped
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 12 Mar 2013 11:42:27 +0000 (12:42 +0100)]
utils: Dont sent fake channel layouts, 0 layout is better when its not known
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 12 Mar 2013 11:41:16 +0000 (12:41 +0100)]
Merge commit '
2eba9087f3031c6050f8dcd996225490be6c2410 '
* commit '
2eba9087f3031c6050f8dcd996225490be6c2410 ':
lavc: make up a fake frame channel layout when there is no real one.
Conflicts:
libavcodec/utils.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 12 Mar 2013 11:23:04 +0000 (12:23 +0100)]
Merge commit '
192f1984b1a93aa08af053b8f9ab4950f307bd5d '
* commit '
192f1984b1a93aa08af053b8f9ab4950f307bd5d ':
lavc: limit maximum number of channels to 63
Merged-by: Michael Niedermayer <michaelni@gmx.at>