OSDN Git Service
Michael Niedermayer [Tue, 12 Mar 2013 02:20:18 +0000 (03:20 +0100)]
Merge commit '
759001c534287a96dc96d1e274665feb7059145d'
* commit '
759001c534287a96dc96d1e274665feb7059145d':
lavc decoders: work with refcounted frames.
Anton Khirnov (1):
lavc decoders: work with refcounted frames.
Clément Bœsch (47):
lavc/ansi: reset file
lavc/ansi: re-do refcounted frame changes from Anton
fraps: reset file
lavc/fraps: switch to refcounted frames
gifdec: reset file
lavc/gifdec: switch to refcounted frames
dsicinav: resolve conflicts
smc: resolve conflicts
zmbv: resolve conflicts
rpza: resolve conflicts
vble: resolve conflicts
xxan: resolve conflicts
targa: resolve conflicts
vmnc: resolve conflicts
utvideodec: resolve conflicts
tscc: resolve conflicts
ulti: resolve conflicts
ffv1dec: resolve conflicts
dnxhddec: resolve conflicts
v210dec: resolve conflicts
vp3: resolve conflicts
vcr1: resolve conflicts
v210x: resolve conflicts
wavpack: resolve conflicts
pngdec: fix compilation
roqvideodec: resolve conflicts
pictordec: resolve conflicts
mdec: resolve conflicts
tiertexseqv: resolve conflicts
smacker: resolve conflicts
vb: resolve conflicts
vqavideo: resolve conflicts
xl: resolve conflicts
tmv: resolve conflicts
vmdav: resolve conflicts
truemotion1: resolve conflicts
truemotion2: resolve conflicts
lcldec: fix compilation
libcelt_dec: fix compilation
qdrw: fix compilation
r210dec: fix compilation
rl2: fix compilation
wnv1: fix compilation
yop: fix compilation
tiff: resolve conflicts
interplayvideo: fix compilation
qpeg: resolve conflicts (FIXME/TESTME).
Hendrik Leppkes (33):
012v: convert to refcounted frames
8bps: fix compilation
8svx: resolve conflicts
4xm: resolve conflicts
aasc: resolve conflicts
bfi: fix compilation
aura: fix compilation
alsdec: resolve conflicts
avrndec: convert to refcounted frames
avuidec: convert to refcounted frames
bintext: convert to refcounted frames
cavsdec: resolve conflicts
brender_pix: convert to refcounted frames
cinepak: resolve conflicts
cinepak: avoid using AVFrame struct directly in private context
cljr: fix compilation
cpia: convert to refcounted frames
cscd: resolve conflicts
iff: resolve conflicts and do proper conversion to refcounted frames
4xm: fix reference frame handling
cyuv: fix compilation
dxa: fix compilation
eacmv: fix compilation
eamad: fix compilation
eatgv: fix compilation
escape124: remove unused variable.
escape130: convert to refcounted frames
evrcdec: convert to refcounted frames
exr: convert to refcounted frames
mvcdec: convert to refcounted frames
paf: properly free the frame data on decode close
sgirle: convert to refcounted frames
lavfi/moviesrc: use refcounted frames
Michael Niedermayer (56):
Merge commit '
759001c534287a96dc96d1e274665feb7059145d'
resolve conflicts in headers
motion_est: resolve conflict
mpeg4videodec: fix conflicts
dpcm conflict fix
dpx: fix conflicts
indeo3: resolve confilcts
kmvc: resolve conflicts
kmvc: resolve conflicts
h264: resolve conflicts
utils: resolve conflicts
rawdec: resolve conflcits
mpegvideo: resolve conflicts
svq1enc: resolve conflicts
mpegvideo: dont clear data, fix assertion failure on fate vsynth1 with threads
pthreads: resolve conflicts
frame_thread_encoder: simple compilefix not yet tested
snow: update to buffer refs
crytsalhd: fix compile
dirac: switch to new API
sonic: update to new API
svq1: resolve conflict, update to new API
ffwavesynth: update to new buffer API
g729: update to new API
indeo5: fix compile
j2kdec: update to new buffer API
linopencore-amr: fix compile
libvorbisdec: update to new API
loco: fix compile
paf: update to new API
proresdec: update to new API
vp56: update to new api / resolve conflicts
xface: convert to refcounted frames
xan: fix compile&fate
v408: update to ref counted buffers
v308: update to ref counted buffers
yuv4dec: update to ref counted buffers
y41p: update to ref counted frames
xbm: update to refcounted frames
targa_y216: update to refcounted buffers
qpeg: fix fate/crash
cdxl: fix fate
tscc: fix reget buffer useage
targa_y216dec: fix style
msmpeg4: fix fate
h264: ref_picture() copy fields that have been lost too
update_frame_pool: use channel field
h264: Put code that prevents deadlocks back
mpegvideo: dont allow last == current
wmalossless: fix buffer ref messup
ff_alloc_picture: free tables in case of dimension mismatches
h264: fix null pointer dereference and assertion failure
frame_thread_encoder: update to bufrefs
ec: fix used arrays
snowdec: fix off by 1 error in dimensions check
h264: disallow single unpaired fields as references of frames
Paul B Mahol (2):
lavc/vima: convert to refcounted frames
sanm: convert to refcounted frames
Conflicts:
libavcodec/4xm.c
libavcodec/8bps.c
libavcodec/8svx.c
libavcodec/aasc.c
libavcodec/alsdec.c
libavcodec/anm.c
libavcodec/ansi.c
libavcodec/avs.c
libavcodec/bethsoftvideo.c
libavcodec/bfi.c
libavcodec/c93.c
libavcodec/cavsdec.c
libavcodec/cdgraphics.c
libavcodec/cinepak.c
libavcodec/cljr.c
libavcodec/cscd.c
libavcodec/dnxhddec.c
libavcodec/dpcm.c
libavcodec/dpx.c
libavcodec/dsicinav.c
libavcodec/dvdec.c
libavcodec/dxa.c
libavcodec/eacmv.c
libavcodec/eamad.c
libavcodec/eatgq.c
libavcodec/eatgv.c
libavcodec/eatqi.c
libavcodec/error_resilience.c
libavcodec/escape124.c
libavcodec/ffv1.h
libavcodec/ffv1dec.c
libavcodec/flicvideo.c
libavcodec/fraps.c
libavcodec/frwu.c
libavcodec/g723_1.c
libavcodec/gifdec.c
libavcodec/h264.c
libavcodec/h264.h
libavcodec/h264_direct.c
libavcodec/h264_loopfilter.c
libavcodec/h264_refs.c
libavcodec/huffyuvdec.c
libavcodec/idcinvideo.c
libavcodec/iff.c
libavcodec/indeo2.c
libavcodec/indeo3.c
libavcodec/internal.h
libavcodec/interplayvideo.c
libavcodec/ivi_common.c
libavcodec/jvdec.c
libavcodec/kgv1dec.c
libavcodec/kmvc.c
libavcodec/lagarith.c
libavcodec/libopenjpegdec.c
libavcodec/mdec.c
libavcodec/mimic.c
libavcodec/mjpegbdec.c
libavcodec/mjpegdec.c
libavcodec/mmvideo.c
libavcodec/motion_est.c
libavcodec/motionpixels.c
libavcodec/mpc7.c
libavcodec/mpeg12.c
libavcodec/mpeg4videodec.c
libavcodec/mpegvideo.c
libavcodec/mpegvideo.h
libavcodec/msrle.c
libavcodec/msvideo1.c
libavcodec/nuv.c
libavcodec/options_table.h
libavcodec/pcx.c
libavcodec/pictordec.c
libavcodec/pngdec.c
libavcodec/pnmdec.c
libavcodec/pthread.c
libavcodec/qpeg.c
libavcodec/qtrle.c
libavcodec/r210dec.c
libavcodec/rawdec.c
libavcodec/roqvideodec.c
libavcodec/rpza.c
libavcodec/smacker.c
libavcodec/smc.c
libavcodec/svq1dec.c
libavcodec/svq1enc.c
libavcodec/targa.c
libavcodec/tiertexseqv.c
libavcodec/tiff.c
libavcodec/tmv.c
libavcodec/truemotion1.c
libavcodec/truemotion2.c
libavcodec/tscc.c
libavcodec/ulti.c
libavcodec/utils.c
libavcodec/utvideodec.c
libavcodec/v210dec.c
libavcodec/v210x.c
libavcodec/vb.c
libavcodec/vble.c
libavcodec/vcr1.c
libavcodec/vmdav.c
libavcodec/vmnc.c
libavcodec/vp3.c
libavcodec/vp56.c
libavcodec/vp56.h
libavcodec/vp6.c
libavcodec/vqavideo.c
libavcodec/wavpack.c
libavcodec/xl.c
libavcodec/xxan.c
libavcodec/zmbv.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 11 Mar 2013 23:28:08 +0000 (00:28 +0100)]
snowdec: fix off by 1 error in dimensions check
fixes infinite loop
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Nicolas George [Sun, 10 Mar 2013 18:59:48 +0000 (19:59 +0100)]
lavfi/buffersink: move the filter structures at the end.
Also apply a few cosmetic fixes (spaces, trailing comma) to
help match them with the fork's implementation.
Clément Bœsch [Mon, 11 Mar 2013 02:55:08 +0000 (03:55 +0100)]
cmdutils: remove conditionnal pp include.
The definition of the include are needed for builds even without pp.
This should fix FATE with --disable-gpl after
63edd2f9.
Nicolas George [Sun, 10 Mar 2013 15:44:46 +0000 (16:44 +0100)]
lavfi/buffersink: implement av_buffersink_get_samples().
Note: the implementation could be more efficient, but at
the cost of more diff.
Most of the code from the following commit:
commit
a2cd9be212fca02dd3d6ee65cb6ab9f84c5e28e5
Author: Anton Khirnov <anton@khirnov.net>
Date: Fri May 4 19:22:38 2012 +0200
lavfi: add an audio buffer sink.
Adapted to call av_buffersink_get_frame_flags() instead of
accessing the frame directly.
Nicolas George [Sun, 10 Mar 2013 15:28:33 +0000 (16:28 +0100)]
lavfi/buffersrc: do not dereference NULL frame.
frame = NULL is used to indicate EOF.
Nicolas George [Sun, 10 Mar 2013 15:01:12 +0000 (16:01 +0100)]
lavfi: rename sink_buffer.c into buffersink.c.
Nicolas George [Sun, 10 Mar 2013 14:57:43 +0000 (15:57 +0100)]
lavfi: remove buffersink.c.
It only contains merge conflicts leftovers.
The real code is in sink_buffer.c.
Nicolas George [Sun, 10 Mar 2013 14:55:33 +0000 (15:55 +0100)]
lavfi/sink_buffer: move stuff to reduce the diff.
Note: av_buffersink_get_samples() is not yet implemented,
abuffersink is not yet a drop-in replacement of the fork's
abuffersink.
Stefano Sabatini [Sun, 10 Mar 2013 12:13:10 +0000 (13:13 +0100)]
lavfi/smartblur: add support to named options
Nicolas George [Sun, 10 Mar 2013 13:07:29 +0000 (14:07 +0100)]
ffmpeg: re-enable use of buffersrc flags.
AV_BUFFERSRC_FLAG_PUSH is necessary to detect closed streams.
Nicolas George [Sun, 10 Mar 2013 12:33:18 +0000 (13:33 +0100)]
lavfi/buffersrc: implement flags.
The PUSH flags is necessary for efficient scheduling;
otherwise there is no feedback when adding frames to
closed paths.
The NO_CHECK_FORMAT is a small optimization that does
not cost much to implement.
The KEEP_REF flag maps to the add/write distinction in
the fork's API.
Nicolas George [Wed, 27 Feb 2013 20:14:48 +0000 (21:14 +0100)]
ffmpeg: add the -canvas_size option.
Allows, amongst other things, to override the size guessed
by the sub2video hack.
Note: the -s option could have more or less the same semantic,
but it receives a special treatment by the options system.
Nicolas George [Sun, 10 Mar 2013 10:51:02 +0000 (11:51 +0100)]
ffmpeg: port sub2video to AVFrame.
And re-enable the FATE test.
Stefano Sabatini [Sun, 10 Mar 2013 10:51:00 +0000 (11:51 +0100)]
doc/ffplay,ffmpeg: mention the corresponding negated option for -stats
This helps lazy users who didn't read the part about boolean options, in
case they grep for "-nostats".
-stdin and -stats are the only booleans option enabled by default. This
is a partial fix for Trac ticket #2332, a complete overhaul of boolean
options documentation is probably overkill.
Stefano Sabatini [Sun, 10 Mar 2013 10:05:32 +0000 (11:05 +0100)]
cmdutils: clarify log message, in case of option routed to both codec and mux/demux layer
Stefano Sabatini [Sun, 10 Mar 2013 11:02:24 +0000 (12:02 +0100)]
cmdutils: remove duplicated check on CONFIG_POSTPROC
The check is already performed by the PRINT_LIB_INFO macro.
Stefano Sabatini [Sun, 10 Mar 2013 10:48:11 +0000 (11:48 +0100)]
cmdutils: make print_all_libs_info() show libavresample version
Even if not directly supported by FFmpeg, it is still useful to see the
linked version of libavresample.
Stefano Sabatini [Sun, 10 Mar 2013 10:04:24 +0000 (11:04 +0100)]
cmdutils: fix stylenits
Stefano Sabatini [Sun, 10 Mar 2013 12:20:44 +0000 (13:20 +0100)]
lavfi/unsharp: add missing option flags
Stefano Sabatini [Fri, 8 Mar 2013 22:39:50 +0000 (23:39 +0100)]
lavc/utils: fix typo and reword message in case of too low bitrate
Michael Niedermayer [Sun, 10 Mar 2013 10:20:07 +0000 (11:20 +0100)]
avfilter: avoid direct access to "frame"->channels
This avoids ABI issues
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Fabrizio Gennari [Sun, 10 Mar 2013 09:22:45 +0000 (10:22 +0100)]
mem: Fix usage of memalign() on DJGPP.
Credits to Khusraw of bttr-software.de forum.
Signed-off-by: Carl Eugen Hoyos <cehoyos@ag.or.at>
Xi Wang [Sun, 10 Mar 2013 03:39:32 +0000 (22:39 -0500)]
lavfi/pad: avoid buffer overflow in buffer_needs_copy()
Replace & with short-circuit &&.
Signed-off-by: Xi Wang <xi.wang@gmail.com>
Signed-off-by: Stefano Sabatini <stefasab@gmail.com>
Clément Bœsch [Mon, 4 Mar 2013 15:06:14 +0000 (16:06 +0100)]
lavfi: add curves filter.
Clément Bœsch [Sun, 10 Mar 2013 01:59:43 +0000 (02:59 +0100)]
lavfi: bump minor version after the first round of evil changes.
Michael Niedermayer [Sun, 10 Mar 2013 01:52:15 +0000 (02:52 +0100)]
sink_buffer: remove unused variables
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Ronald S. Bultje [Sat, 9 Mar 2013 17:08:36 +0000 (09:08 -0800)]
vp3: embed idct_permutation array directly in VP3DecoderContext.
This makes the vp3 decoder less dependent on dsputil, and will aid
in making it (eventually) dsputil-independent.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Clément Bœsch [Sun, 10 Mar 2013 01:32:35 +0000 (02:32 +0100)]
lavfi: remove remaining forgotten min/rej perms.
Michael Niedermayer [Mon, 4 Feb 2013 22:41:53 +0000 (23:41 +0100)]
mpegts: clear avprograms only for removed programs
Fixes Ticket2186
Requested-by: carl
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 10 Mar 2013 01:21:00 +0000 (02:21 +0100)]
Merge remote-tracking branch 'cehoyos/master'
* cehoyos/master:
Revert "build: disable iconv by default."
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Clément Bœsch [Sat, 9 Mar 2013 04:19:14 +0000 (05:19 +0100)]
lavfi/hue: reindent.
Clément Bœsch [Sat, 9 Mar 2013 04:17:01 +0000 (05:17 +0100)]
lavfi/hue: add an optimized direct path.
Michael Niedermayer [Sun, 10 Mar 2013 01:08:58 +0000 (02:08 +0100)]
Merge commit '
6e7b50b4270116ded8b874d76cb7c5b1a0341827'
* commit '
6e7b50b4270116ded8b874d76cb7c5b1a0341827':
mpegvideo_enc: drop support for reusing the input motion vectors.
Conflicts:
libavcodec/motion_est.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Clément Bœsch [Sun, 10 Mar 2013 01:07:34 +0000 (02:07 +0100)]
lavu/frame: fix not/note typo in doxy.
Clément Bœsch [Sat, 9 Mar 2013 23:33:47 +0000 (00:33 +0100)]
doc: fix examples.
Michael Niedermayer [Sat, 9 Mar 2013 23:07:34 +0000 (00:07 +0100)]
fate: disable sub2video
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Nicolas George [Sat, 9 Mar 2013 20:19:23 +0000 (21:19 +0100)]
ffmpeg: do not give away our reference to the frame.
Note: the logic here is temporary until the updates to
ffmpeg.c are merged.
Nicolas George [Sat, 9 Mar 2013 19:21:10 +0000 (20:21 +0100)]
lavc/rawdec: set field order on decoded frame.
Nicolas George [Sat, 9 Mar 2013 15:47:38 +0000 (16:47 +0100)]
rawdec: work with refcounted frames.
Adapted from commit
759001c534287a96dc96d1e274665feb7059145d
by Anton Khirnov.
Also, fix the use of || instead of | in a flags check.
Michael Niedermayer [Sun, 10 Mar 2013 00:30:30 +0000 (01:30 +0100)]
Merge commit '
7e350379f87e7f74420b4813170fe808e2313911'
* commit '
7e350379f87e7f74420b4813170fe808e2313911':
lavfi: switch to AVFrame.
Conflicts:
doc/filters.texi
libavfilter/af_ashowinfo.c
libavfilter/audio.c
libavfilter/avfilter.c
libavfilter/avfilter.h
libavfilter/buffersink.c
libavfilter/buffersrc.c
libavfilter/buffersrc.h
libavfilter/f_select.c
libavfilter/f_setpts.c
libavfilter/fifo.c
libavfilter/split.c
libavfilter/src_movie.c
libavfilter/version.h
libavfilter/vf_aspect.c
libavfilter/vf_bbox.c
libavfilter/vf_blackframe.c
libavfilter/vf_delogo.c
libavfilter/vf_drawbox.c
libavfilter/vf_drawtext.c
libavfilter/vf_fade.c
libavfilter/vf_fieldorder.c
libavfilter/vf_fps.c
libavfilter/vf_frei0r.c
libavfilter/vf_gradfun.c
libavfilter/vf_hqdn3d.c
libavfilter/vf_lut.c
libavfilter/vf_overlay.c
libavfilter/vf_pad.c
libavfilter/vf_scale.c
libavfilter/vf_showinfo.c
libavfilter/vf_transpose.c
libavfilter/vf_vflip.c
libavfilter/vf_yadif.c
libavfilter/video.c
libavfilter/vsrc_testsrc.c
libavfilter/yadif.h
Following are notes about the merge authorship and various technical details.
Michael Niedermayer:
* Main merge operation, notably avfilter.c and video.c
* Switch to AVFrame:
- afade
- anullsrc
- apad
- aresample
- blackframe
- deshake
- idet
- il
- mandelbrot
- mptestsrc
- noise
- setfield
- smartblur
- tinterlace
* various merge changes and fixes in:
- ashowinfo
- blackdetect
- field
- fps
- select
- testsrc
- yadif
Nicolas George:
* Switch to AVFrame:
- make rawdec work with refcounted frames. Adapted from commit
759001c534287a96dc96d1e274665feb7059145d by Anton Khirnov.
Also, fix the use of || instead of | in a flags check.
- make buffer sink and src, audio and video work all together
Clément Bœsch:
* Switch to AVFrame:
- aevalsrc
- alphaextract
- blend
- cellauto
- colormatrix
- concat
- earwax
- ebur128
- edgedetect
- geq
- histeq
- histogram
- hue
- kerndeint
- life
- movie
- mp (with the help of Michael)
- overlay
- pad
- pan
- pp
- pp
- removelogo
- sendcmd
- showspectrum
- showwaves
- silencedetect
- stereo3d
- subtitles
- super2xsai
- swapuv
- thumbnail
- tile
Hendrik Leppkes:
* Switch to AVFrame:
- aconvert
- amerge
- asetnsamples
- atempo
- biquads
Matthieu Bouron:
* Switch to AVFrame
- alphamerge
- decimate
- volumedetect
Stefano Sabatini:
* Switch to AVFrame:
- astreamsync
- flite
- framestep
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: Nicolas George <nicolas.george@normalesup.org>
Signed-off-by: Clément Bœsch <ubitux@gmail.com>
Signed-off-by: Hendrik Leppkes <h.leppkes@gmail.com>
Signed-off-by: Matthieu Bouron <matthieu.bouron@gmail.com>
Signed-off-by: Stefano Sabatini <stefasab@gmail.com>
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Carl Eugen Hoyos [Sat, 9 Mar 2013 17:25:22 +0000 (18:25 +0100)]
Revert "build: disable iconv by default."
This reverts commit
9ad3cd5b5f848eb3cd033be515d34296f099148b.
The misdetection on OS X should be fixed, we will only get
problem reports if auto-detection is enabled.
Clément Bœsch [Sat, 9 Mar 2013 23:34:16 +0000 (00:34 +0100)]
port FFmpeg lavc frame specificities to lavu functions.
Nicolas George [Sat, 9 Mar 2013 16:17:59 +0000 (17:17 +0100)]
lavu/frame: copy the channels field.
Clément Bœsch [Sat, 9 Mar 2013 22:52:30 +0000 (23:52 +0100)]
lavfi/showspectrum: fix outpicref initialization.
In
81f2549, output pixel format was changed from rgb24 to planar yuv,
but the initialization was left unchanged. As a result, the chroma
planes were left uninitalized. This was not noticed since the current
ff_get_video_buffer() seems to be initializing the buffer. This won't be
the case anymore after the Evil Plan.
Ronald S. Bultje [Sat, 9 Mar 2013 04:40:16 +0000 (20:40 -0800)]
x86/qpel: move fullpel and l2 functions to separate file.
This way, they can be shared between mpeg4qpel and h264qpel without
requiring either one to be compiled unconditionally.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Ronald S. Bultje [Sat, 9 Mar 2013 04:16:08 +0000 (20:16 -0800)]
dsputil: make square put/avg_pixels functions local to h264qpel.
Put a copy of the 8bit functions only in dsputil, where they are used
for some other things (e.g. mpeg4qpel, mspel, cavsqpel). We could perhaps
also try to share specifically the 8bit functions from h264qpel between
it and the others, but that will be slightly more complicated. H264qpel
already had these functions, so we can simply remove the duplicates.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Giorgio Vazzana [Sat, 9 Mar 2013 13:46:00 +0000 (14:46 +0100)]
lavd/v4l2: simplify code
struct buff_data contains a pointer to struct video_data, so passing the
file descriptor again is redundant.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Giorgio Vazzana [Sat, 9 Mar 2013 13:36:56 +0000 (14:36 +0100)]
lavd/v4l2: correctly handle error conditions in mmap_read_frame()
In particular:
1) save errno before it (possibly) gets overwritten by other calls
2) do not forget to enqueue the buffer again in case of error
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Carl Eugen Hoyos [Sat, 9 Mar 2013 14:46:46 +0000 (15:46 +0100)]
Add some fate dependencies to fix make fate with --disable-everything.
Carl Eugen Hoyos [Sat, 9 Mar 2013 13:39:13 +0000 (14:39 +0100)]
Add some fate dependencies to fix make fate with --disable-avdevice.
Stephen Hutchinson [Fri, 8 Mar 2013 22:42:24 +0000 (17:42 -0500)]
libutvideo: Prioritize compatibility with new versions
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Martin Storsjö [Fri, 8 Mar 2013 09:16:14 +0000 (11:16 +0200)]
atomic: Add include guards to the implementation headers
This makes them pass standalone compilation tests. Previously,
they included atomic.h which included themselves again, leading to
double definitions.
Signed-off-by: Martin Storsjö <martin@martin.st>
Clément Bœsch [Fri, 8 Mar 2013 19:38:01 +0000 (20:38 +0100)]
lavc/utils: make sure the iconv descriptor can be opened only once.
This prevents trying to do some subtitles conversion for each event when
the character encoding is not found. It now aborts early instead of
flooding stderr.
Michael Niedermayer [Fri, 8 Mar 2013 19:41:41 +0000 (20:41 +0100)]
Merge commit '
77b2cd7b41d7ec8008b6fac753c04f77824c514c'
* commit '
77b2cd7b41d7ec8008b6fac753c04f77824c514c':
AVFrame: add side data.
Conflicts:
libavutil/frame.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 8 Mar 2013 19:18:45 +0000 (20:18 +0100)]
Merge commit '
7ecc2d403ce5c7b6ea3b1f368dccefd105209c7e'
* commit '
7ecc2d403ce5c7b6ea3b1f368dccefd105209c7e':
Move AVFrame from lavc to lavu.
Conflicts:
libavcodec/avcodec.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 8 Mar 2013 18:35:37 +0000 (19:35 +0100)]
Merge commit '
ad0c9f2d5d81e22207c6ccecc426bf7306acc327'
* commit '
ad0c9f2d5d81e22207c6ccecc426bf7306acc327':
lavc: move AVFrame.hwaccel_picture_private to Picture.
Conflicts:
libavcodec/avcodec.h
libavcodec/mpegvideo.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 8 Mar 2013 18:17:31 +0000 (19:17 +0100)]
Merge commit '
1a5e9130162b8adc898e5f6aea82b6372d1e4e6c'
* commit '
1a5e9130162b8adc898e5f6aea82b6372d1e4e6c':
pthread: avoid copying input packets when possible.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 8 Mar 2013 16:28:42 +0000 (17:28 +0100)]
Merge commit '
1afddbe59e96af75f1c07605afc95615569f388f'
* commit '
1afddbe59e96af75f1c07605afc95615569f388f':
avpacket: use AVBuffer to allow refcounting the packets.
Conflicts:
libavcodec/avpacket.c
libavcodec/utils.c
libavdevice/v4l2.c
libavformat/avidec.c
libavformat/flacdec.c
libavformat/id3v2.c
libavformat/matroskaenc.c
libavformat/mux.c
libavformat/utils.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 8 Mar 2013 15:05:59 +0000 (16:05 +0100)]
Merge commit '
1cec0624d0e6f48590283a57169b58b9fe8449d3'
* commit '
1cec0624d0e6f48590283a57169b58b9fe8449d3':
AVBuffer: add a new API for buffer pools
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 8 Mar 2013 15:01:00 +0000 (16:01 +0100)]
Merge commit '
8e401dbe90cc77b1f3067a917d9fa48cefa3fcdb'
* commit '
8e401dbe90cc77b1f3067a917d9fa48cefa3fcdb':
lavu: add a new API for reference-counted data buffers.
Conflicts:
libavutil/Makefile
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 8 Mar 2013 14:47:06 +0000 (15:47 +0100)]
Merge commit '
65f1d45dcc71186ede72fff950996099d23359bd'
* commit '
65f1d45dcc71186ede72fff950996099d23359bd':
lavu: add support for atomic operations.
Conflicts:
configure
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 8 Mar 2013 14:42:32 +0000 (15:42 +0100)]
Merge commit '
eae0879d961b78717dd2a0899809ad22819ae9e3'
* commit '
eae0879d961b78717dd2a0899809ad22819ae9e3':
mp3dec: Fix VBR bit rate parsing
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 8 Mar 2013 14:37:00 +0000 (15:37 +0100)]
Merge commit '
4be368b504c6f4a03051448728fc62cd0ed506b2'
* commit '
4be368b504c6f4a03051448728fc62cd0ed506b2':
avstring: Fix isxdigit to not accept non-hex characters
configure: Add missing videodsp dependencies to some decoders
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 8 Mar 2013 14:32:39 +0000 (15:32 +0100)]
Merge commit '
dbd2a34ba5e5e46b6835e4425c360723c643b7a8'
* commit '
dbd2a34ba5e5e46b6835e4425c360723c643b7a8':
build: cosmetics: Group hw accelerator Makefile entries together
Conflicts:
libavcodec/Makefile
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 8 Mar 2013 14:23:56 +0000 (15:23 +0100)]
Merge commit '
bcd0a7137e4aca0f6f598593b90ca8f338444c51'
* commit '
bcd0a7137e4aca0f6f598593b90ca8f338444c51':
configure: Add missing h264chroma dependencies to vp5, vp6
Add missing error_resilience includes to files that use ER
Conflicts:
configure
libavcodec/mpeg12.c
libavcodec/mpeg4videodec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 8 Mar 2013 14:17:15 +0000 (15:17 +0100)]
Merge commit '
d88738e4038b162708dc2f5342e10c1694edfd89'
* commit '
d88738e4038b162708dc2f5342e10c1694edfd89':
mpegvideo: Conditionally build error_resilience bits
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 8 Mar 2013 14:05:18 +0000 (15:05 +0100)]
Merge commit '
06b54e84254e4834b4978ff5b27cc2b7ee8d7a98'
* commit '
06b54e84254e4834b4978ff5b27cc2b7ee8d7a98':
build: Fix error_resilience code dependencies
Conflicts:
configure
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 8 Mar 2013 13:57:41 +0000 (14:57 +0100)]
Merge commit '
efa7f4202088c70caba11d7834641bc6eaf41830'
* commit '
efa7f4202088c70caba11d7834641bc6eaf41830':
Use the avstring.h locale-independent character type functions
avstring: Add locale independent versions of some ctype.h functions
Conflicts:
avprobe.c
doc/APIchanges
libavcodec/dvdsubdec.c
libavcodec/utils.c
libavutil/avstring.c
libavutil/avstring.h
libavutil/eval.c
libavutil/parseutils.c
libavutil/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 8 Mar 2013 13:45:26 +0000 (14:45 +0100)]
MAINTAINERS: update for 1.2
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 8 Mar 2013 13:07:36 +0000 (14:07 +0100)]
Revert "aacdec: Reconfigure output as needed, disable pop_output_configuration()"
This reverts commit
60dbf2eff92f8aa4683b6dcaba9e694890258ade.
This is not needed anymore, Ticket 1694 has been fixed differently
Michael Niedermayer [Fri, 8 Mar 2013 13:00:22 +0000 (14:00 +0100)]
aacsbr: Check for envelope scalefactors overflowing
This prevents various values from becoming stuck at NAN and
output to become silent
If someone knows a cleaner solution, thats welcome!
Fixes Ticket2335
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Anton Khirnov [Wed, 21 Nov 2012 20:34:46 +0000 (21:34 +0100)]
lavc decoders: work with refcounted frames.
Anton Khirnov [Sun, 3 Mar 2013 19:43:43 +0000 (20:43 +0100)]
mpegvideo_enc: drop support for reusing the input motion vectors.
This misfeature is most likely completely useless and conflicts with
removing the mpegvideo-specific fields from AVFrame. In the improbable
case it is actually useful, it should be reimplemented in a better way.
Anton Khirnov [Wed, 28 Nov 2012 07:41:07 +0000 (08:41 +0100)]
lavfi: switch to AVFrame.
Deprecate AVFilterBuffer/AVFilterBufferRef and everything related to it
and use AVFrame instead.
Anton Khirnov [Tue, 25 Dec 2012 21:11:36 +0000 (22:11 +0100)]
AVFrame: add side data.
Anton Khirnov [Wed, 17 Oct 2012 09:51:01 +0000 (11:51 +0200)]
Move AVFrame from lavc to lavu.
Add AVBuffer-based reference counting API to it.
Anton Khirnov [Mon, 8 Oct 2012 05:50:14 +0000 (07:50 +0200)]
lavc: move AVFrame.hwaccel_picture_private to Picture.
This field is private and should not be present in a public struct. It
is only used in DXVA with mpegvideo-based decoders currently.
Anton Khirnov [Wed, 31 Oct 2012 15:36:07 +0000 (16:36 +0100)]
pthread: avoid copying input packets when possible.
Anton Khirnov [Wed, 31 Oct 2012 07:53:18 +0000 (08:53 +0100)]
avpacket: use AVBuffer to allow refcounting the packets.
This will allow us to avoid copying the packets in many cases.
This breaks ABI.
Anton Khirnov [Sun, 20 Jan 2013 07:03:13 +0000 (08:03 +0100)]
AVBuffer: add a new API for buffer pools
Anton Khirnov [Sun, 7 Oct 2012 13:45:44 +0000 (15:45 +0200)]
lavu: add a new API for reference-counted data buffers.
Ronald S. Bultje [Sun, 2 Dec 2012 22:34:50 +0000 (14:34 -0800)]
lavu: add support for atomic operations.
These could be used for reference counting, or for keeping track of
decoding progress in references in multithreaded decoders.
Support is provided by gcc/msvc/suncc intrinsics, with a fallback using
pthread mutexes.
Signed-off-by: Anton Khirnov <anton@khirnov.net>
Alexander Kojevnikov [Thu, 7 Mar 2013 05:38:55 +0000 (21:38 -0800)]
mp3dec: Fix VBR bit rate parsing
When parsing the Xing/Info tag, don't set the bit rate if it's an Info tag.
When parsing the stream, don't override the bit rate if it's already set,
otherwise calculate the mean bit rate from parsed frames. This way, the bit
rate will be set correctly both for CBR and VBR streams.
CC:libav-stable@libav.org
Signed-off-by: Anton Khirnov <anton@khirnov.net>
Carl Eugen Hoyos [Fri, 8 Mar 2013 01:46:46 +0000 (02:46 +0100)]
Close output codecs if input codec initialisation fails.
Fixes ticket #1546 and the remaining part of ticket #1244.
Carl Eugen Hoyos [Fri, 8 Mar 2013 01:45:27 +0000 (02:45 +0100)]
Add dependencies for the voice fate tests.
Carl Eugen Hoyos [Fri, 8 Mar 2013 01:44:46 +0000 (02:44 +0100)]
Add dependencies for the flac encoding fate tests.
Carl Eugen Hoyos [Fri, 8 Mar 2013 01:44:07 +0000 (02:44 +0100)]
Add dependencies for the aac encoding fate tests.
Carl Eugen Hoyos [Fri, 8 Mar 2013 01:42:33 +0000 (02:42 +0100)]
Force using a 64bit intermediate when calculating calendar time with av_timegm().
Fixes a fate failure with icc 13.1
Alexander Kojevnikov [Thu, 7 Mar 2013 05:58:59 +0000 (21:58 -0800)]
mpegaudio_parser: Don't ignore information from the first frame
Signed-off-by: Alexander Kojevnikov <alexander@kojevnikov.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 22 Feb 2013 23:47:38 +0000 (00:47 +0100)]
aacdec: Reconfigure output as needed, disable pop_output_configuration()
Fixes Ticket1694
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 7 Mar 2013 18:28:30 +0000 (19:28 +0100)]
psymodel: dont apply lowpass filters with a cutoff close to the nyquist
The IIR filter numerically diverges in such cases, this could easily be
fixed but would make the filter slower on some platforms
Fixes Ticket2246
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Martin Storsjö [Thu, 7 Mar 2013 13:21:03 +0000 (15:21 +0200)]
avstring: Fix isxdigit to not accept non-hex characters
Signed-off-by: Martin Storsjö <martin@martin.st>
Diego Biurrun [Thu, 7 Mar 2013 14:20:54 +0000 (15:20 +0100)]
configure: Add missing videodsp dependencies to some decoders
Diego Biurrun [Thu, 7 Mar 2013 13:57:30 +0000 (14:57 +0100)]
build: cosmetics: Group hw accelerator Makefile entries together
Diego Biurrun [Wed, 6 Mar 2013 18:30:25 +0000 (19:30 +0100)]
configure: Add missing h264chroma dependencies to vp5, vp6
Martin Storsjö [Wed, 6 Mar 2013 17:28:49 +0000 (18:28 +0100)]
mpegvideo: Conditionally build error_resilience bits
This breaks the dependency of mpegvideo on error_resilience allowing
compilation of components that depend on the former w/o the latter.
Diego Biurrun [Wed, 6 Mar 2013 16:32:31 +0000 (17:32 +0100)]
build: Fix error_resilience code dependencies
Diego Biurrun [Wed, 6 Mar 2013 17:31:14 +0000 (18:31 +0100)]
Add missing error_resilience includes to files that use ER
Reimar Döffinger [Sun, 3 Mar 2013 10:17:50 +0000 (11:17 +0100)]
Use the avstring.h locale-independent character type functions
Make sure the behavior does not change with the locale.
Signed-off-by: Martin Storsjö <martin@martin.st>