Nicolas George
fb14e37dd0
ffmpeg: re-enable use of buffersrc flags.
...
AV_BUFFERSRC_FLAG_PUSH is necessary to detect closed streams.
2013-03-10 14:07:29 +01:00
Nicolas George
b0012de420
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.
2013-03-10 13:56:17 +01:00
Nicolas George
cb2bd91413
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.
2013-03-10 13:48:49 +01:00
Nicolas George
f9b34b8bf9
ffmpeg: port sub2video to AVFrame.
...
And re-enable the FATE test.
2013-03-10 13:45:15 +01:00
Stefano Sabatini
f185a040b0
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.
2013-03-10 13:22:59 +01:00
Stefano Sabatini
a2a848406f
cmdutils: clarify log message, in case of option routed to both codec and mux/demux layer
2013-03-10 13:22:59 +01:00
Stefano Sabatini
63edd2f989
cmdutils: remove duplicated check on CONFIG_POSTPROC
...
The check is already performed by the PRINT_LIB_INFO macro.
2013-03-10 13:22:59 +01:00
Stefano Sabatini
475c090af2
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.
2013-03-10 13:22:59 +01:00
Stefano Sabatini
daf6ea5d4e
cmdutils: fix stylenits
2013-03-10 13:22:59 +01:00
Stefano Sabatini
606efe18be
lavfi/unsharp: add missing option flags
2013-03-10 13:22:58 +01:00
Stefano Sabatini
dae76e8c47
lavc/utils: fix typo and reword message in case of too low bitrate
2013-03-10 13:22:58 +01:00
Michael Niedermayer
f963c77856
avfilter: avoid direct access to "frame"->channels
...
This avoids ABI issues
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-03-10 11:25:54 +01:00
Fabrizio Gennari
91b747ac78
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>
2013-03-10 11:12:56 +01:00
Xi Wang
969e8d35b5
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>
2013-03-10 10:38:42 +01:00
Clément Bœsch
65fc80f012
lavfi: add curves filter.
2013-03-10 03:00:10 +01:00
Clément Bœsch
3d813e7ec3
lavfi: bump minor version after the first round of evil changes.
2013-03-10 02:59:43 +01:00
Michael Niedermayer
108434a30c
sink_buffer: remove unused variables
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-03-10 02:52:15 +01:00
Ronald S. Bultje
d5efa84f13
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>
2013-03-10 02:51:05 +01:00
Clément Bœsch
96e4b00d62
lavfi: remove remaining forgotten min/rej perms.
2013-03-10 02:38:21 +01:00
Michael Niedermayer
806a66fd08
mpegts: clear avprograms only for removed programs
...
Fixes Ticket2186
Requested-by: carl
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-03-10 02:28:05 +01:00
Michael Niedermayer
07ab8d3369
Merge remote-tracking branch 'cehoyos/master'
...
* cehoyos/master:
Revert "build: disable iconv by default."
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-03-10 02:21:04 +01:00
Clément Bœsch
f0a5f71074
lavfi/hue: reindent.
2013-03-10 02:13:02 +01:00
Clément Bœsch
3da54858d3
lavfi/hue: add an optimized direct path.
2013-03-10 02:13:02 +01:00
Michael Niedermayer
4a62f477ea
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>
2013-03-10 02:10:43 +01:00
Clément Bœsch
e53061154f
lavu/frame: fix not/note typo in doxy.
2013-03-10 02:07:34 +01:00
Clément Bœsch
5e4bc96415
doc: fix examples.
2013-03-10 01:41:53 +01:00
Michael Niedermayer
b1b506bc56
fate: disable sub2video
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-03-10 01:41:52 +01:00
Nicolas George
4e7c61b7a7
ffmpeg: do not give away our reference to the frame.
...
Note: the logic here is temporary until the updates to
ffmpeg.c are merged.
2013-03-10 01:41:50 +01:00
Nicolas George
9cc02101ff
lavc/rawdec: set field order on decoded frame.
2013-03-10 01:41:49 +01:00
Nicolas George
6184fa2067
rawdec: work with refcounted frames.
...
Adapted from commit 759001c534
by Anton Khirnov.
Also, fix the use of || instead of | in a flags check.
2013-03-10 01:41:48 +01:00
Michael Niedermayer
a05a44e205
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
759001c534
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>
2013-03-10 01:40:35 +01:00
Carl Eugen Hoyos
3f78f0904b
Revert "build: disable iconv by default."
...
This reverts commit 9ad3cd5b5f
.
The misdetection on OS X should be fixed, we will only get
problem reports if auto-detection is enabled.
2013-03-10 01:28:16 +01:00
Clément Bœsch
586ae70ba7
port FFmpeg lavc frame specificities to lavu functions.
2013-03-10 01:25:02 +01:00
Nicolas George
d1b456b0a8
lavu/frame: copy the channels field.
2013-03-10 01:25:02 +01:00
Clément Bœsch
ee0a8bcba1
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.
2013-03-09 23:52:33 +01:00
Ronald S. Bultje
22cc8a103c
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>
2013-03-09 17:25:30 +01:00
Ronald S. Bultje
9d40f7106d
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>
2013-03-09 17:16:55 +01:00
Giorgio Vazzana
9222978aed
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>
2013-03-09 16:59:13 +01:00
Giorgio Vazzana
0286b42540
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>
2013-03-09 16:58:53 +01:00
Carl Eugen Hoyos
982070c113
Add some fate dependencies to fix make fate with --disable-everything.
2013-03-09 15:46:46 +01:00
Carl Eugen Hoyos
881684e27c
Add some fate dependencies to fix make fate with --disable-avdevice.
2013-03-09 14:39:13 +01:00
Stephen Hutchinson
98c4268eca
libutvideo: Prioritize compatibility with new versions
...
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
2013-03-08 20:45:49 -05:00
Martin Storsjö
309d6f5077
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>
2013-03-08 20:54:40 +01:00
Clément Bœsch
160979f4b4
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.
2013-03-08 20:51:57 +01:00
Michael Niedermayer
307dc32a1a
Merge commit '77b2cd7b41d7ec8008b6fac753c04f77824c514c'
...
* commit '77b2cd7b41d7ec8008b6fac753c04f77824c514c':
AVFrame: add side data.
Conflicts:
libavutil/frame.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-03-08 20:41:41 +01:00
Michael Niedermayer
c4e8821732
Merge commit '7ecc2d403ce5c7b6ea3b1f368dccefd105209c7e'
...
* commit '7ecc2d403ce5c7b6ea3b1f368dccefd105209c7e':
Move AVFrame from lavc to lavu.
Conflicts:
libavcodec/avcodec.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-03-08 20:33:26 +01:00
Michael Niedermayer
fee484edaf
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>
2013-03-08 19:35:37 +01:00
Michael Niedermayer
d9d97f9b33
Merge commit '1a5e9130162b8adc898e5f6aea82b6372d1e4e6c'
...
* commit '1a5e9130162b8adc898e5f6aea82b6372d1e4e6c':
pthread: avoid copying input packets when possible.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-03-08 19:17:38 +01:00
Michael Niedermayer
2653e12520
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>
2013-03-08 19:12:03 +01:00
Michael Niedermayer
532f31a695
Merge commit '1cec0624d0e6f48590283a57169b58b9fe8449d3'
...
* commit '1cec0624d0e6f48590283a57169b58b9fe8449d3':
AVBuffer: add a new API for buffer pools
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-03-08 16:06:20 +01:00