Stefano Sabatini
e80bc76e9e
doc/filters: put separated geq variables in separate lines
...
Make clear that they are not aliases for the same variable.
2013-04-05 01:18:06 +02:00
Michael Niedermayer
0f8435c089
doc: document -v repeat
...
Thanks-to: Derek Buitenhuis
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-04-04 23:36:57 +02:00
Paul B Mahol
b1dea2c0d8
lavfi/blend: add N variable
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-04-04 15:30:06 +00:00
Michael Niedermayer
e7389ed5d0
Merge commit 'bcc94328980e6c56546792ab08b0756abdce310b'
...
* commit 'bcc94328980e6c56546792ab08b0756abdce310b':
opt: check the return values of av_get_token for ENOMEM.
doc: Fix best_nb_channells typo
matroska: pass the lace size to the matroska_parse_rm_audio
Conflicts:
libavformat/matroskadec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-04-04 13:00:59 +02:00
Stefano Sabatini
d344b99954
doc/ffprobe: fix references in See Also section
2013-04-04 10:13:30 +02:00
Stefano Sabatini
36babfdc39
doc/fate.texi: fix typo
2013-04-03 21:07:15 +02:00
Paul B Mahol
9cb25440b3
doc/filters: fix error in blend description
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-04-03 17:06:25 +00:00
Paul B Mahol
bf65752848
aphaser filter
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-04-03 08:33:59 +00:00
highgod0401
9079359141
deshake opencl based on comments on 20130402 3rd
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-04-02 15:57:44 +02:00
Derek Buitenhuis
7d05751581
doc: Grammar fixes for strem specifiers section
...
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
2013-03-31 18:22:09 -04:00
Derek Buitenhuis
0cb2d32453
doc: Fix broken English in the common options description
...
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
2013-03-31 18:22:09 -04:00
Derek Buitenhuis
a034cdf49d
doc: Grammar fixes for stream selection
...
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
2013-03-31 18:22:09 -04:00
Derek Buitenhuis
9db706206d
doc: Consistently use 'filtergraph'
...
We used to use 'filtergraph' or 'filter graph' randomly.
'filtergraph' was chosen due to having 57 occurrences in
the documentation, whereas 'filter graph' had only 19.
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
2013-03-31 18:22:08 -04:00
Derek Buitenhuis
9249b28e79
doc: Grammar fixes for FFmpeg's detailed description
...
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
2013-03-31 18:22:08 -04:00
Derek Buitenhuis
fe64b88950
doc: Consistently use 'frame rate' everywhere
...
We used to use 'framerate' or 'frame rate' randomly.
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
2013-03-31 18:22:08 -04:00
Derek Buitenhuis
91b5ee6699
doc: Grammar fixes for FFmpeg description
...
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
2013-03-31 18:22:08 -04:00
Derek Buitenhuis
9f597052d4
doc: Fix grammar in -n description
...
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
2013-03-31 18:22:08 -04:00
Derek Buitenhuis
876fe11e32
doc: Small grammar fix in -f description
...
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
2013-03-31 18:22:08 -04:00
Derek Buitenhuis
e54a15b681
doc: Document which cpuflags exist
...
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
2013-03-31 18:22:08 -04:00
Derek Buitenhuis
4c79367e9b
doc: Explain the various logevel settings
...
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
2013-03-31 18:22:02 -04:00
Derek Buitenhuis
1fb8ecb498
doc: Remove list of format fields
...
These are available in the output of -formats.
Similarily, we do not list the fields for e.g. -codecs.
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
2013-03-31 18:02:18 -04:00
Michael Niedermayer
a9f8182a9d
doxygen: dont strip code comments
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-03-31 22:34:13 +02:00
Stefano Sabatini
66c92a1575
examples/resampling_audio: make use of av_samples_alloc_array_and_samples()
...
Simplify.
2013-03-31 18:00:45 +02:00
Stefano Sabatini
5c73645d91
lavu/samplefmt: add av_samples_alloc_array_and_pointers()
2013-03-31 18:00:44 +02:00
Timothy Gu
874173002e
doc/filters: fix width/height typo in crop filter.
...
Signed-off-by: Clément Bœsch <ubitux@gmail.com>
2013-03-31 12:20:17 +02:00
Michael Niedermayer
f8201cc18b
Merge remote-tracking branch 'qatar/master'
...
* qatar/master:
doc/platform: Remove part about dllimport
vp8: Fix pthread_cond and pthread_mutex leaks
Conflicts:
doc/platform.texi
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-03-31 11:31:19 +02:00
Derek Buitenhuis
f2f57d1679
doc/platform: Remove part about dllimport
...
Only deprecated things need this at all anymore, as we have functions
to access them or they are no longer needed.
The document should not encourage use of deprecated APIs.
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
2013-03-30 13:52:02 -04:00
Stefano Sabatini
c838701ce4
doc/texi2pod.pl: skip printing chapter names if they are disabled
2013-03-30 16:58:45 +01:00
Michael Niedermayer
6c8aa2035d
Merge remote-tracking branch 'qatar/master'
...
* qatar/master:
fate: add an option to generate the references
Conflicts:
doc/fate.texi
tests/fate-run.sh
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-03-30 11:21:15 +01:00
Michael Niedermayer
ef7b6b489a
ffmpeg/avformat: factor av_guess_frame_rate() out
...
This will be used in ffplay
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-03-29 17:40:28 +01:00
Luca Barbato
b01b60a29d
fate: add an option to generate the references
...
Useful to add or update fate tests.
2013-03-29 15:41:26 +01:00
Michael Niedermayer
ac1a1fd708
Merge commit '1ae44c87c924b69a0657256fbaa8ad140df2f27c'
...
* commit '1ae44c87c924b69a0657256fbaa8ad140df2f27c':
lavfi/gradfun: remove rounding to match C and SSE code.
lavfi/gradfun: fix dithering in MMX code.
lavfi/gradfun: fix rounding in MMX code.
lavfi/gradfun: do not increment DC pointer for odd values.
fate: filter: Add dependencies
avconv: add options for reading filtergraphs from a file.
Conflicts:
Changelog
doc/ffmpeg.texi
doc/filters.texi
ffmpeg.h
ffmpeg_opt.c
libavfilter/vf_gradfun.c
tests/fate/filter.mak
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-03-28 13:00:39 +01:00
Clément Bœsch
2d66fc543b
lavfi/gradfun: fix rounding in MMX code.
...
Current code divides before increasing precision.
Also reduce upper bound for strength from 255 to 64. This will prevent
an overflow in the SSSE3 and MMX filter_line code: delta is expressed as
an u16 being shifted by 2 to the left. If it overflows, having a
strength not above 64 will make sure that m is set to 0 (making the
m*m*delta >> 14 expression void).
A value above 64 should not make any sense unless gradfun is used as
a blur filter.
Signed-off-by: Anton Khirnov <anton@khirnov.net>
2013-03-28 07:59:04 +01:00
Anton Khirnov
a4208b9b7d
avconv: add options for reading filtergraphs from a file.
2013-03-28 07:55:48 +01:00
Clément Bœsch
1a3f7ded14
doc: "av* tools" -> "ff* tools".
...
Spotted-by: Timothy Gu <timothygu99@gmail.com>
2013-03-27 01:44:20 +01:00
Clément Bœsch
9371467d9d
lavfi/perms: add seed option.
2013-03-26 02:39:55 +01:00
Clément Bœsch
133035c40d
lavfi/curves: add forgotten strong_contrast preset.
2013-03-26 01:05:26 +01:00
Clément Bœsch
183f3450fd
lavfi/curves: support preset shorthand.
2013-03-26 00:04:06 +01:00
Clément Bœsch
dc65d784df
lavfi/curves: add presets support.
...
Except for the vintage preset, the values are defined by Lou Logan based
on the ones found in Adobe Photoshop CS6.
Signed-off-by: Clément Bœsch <ubitux@gmail.com>
Signed-off-by: Lou Logan <lou@lrcd.com>
2013-03-25 23:48:51 +01:00
Nicolas George
4f112a8e34
lavf/mux: add the flush_packets option.
...
Note: a lot of muxers already do the flushing explicitly.
2013-03-24 23:19:07 +01:00
Nicolas George
125acd2152
lavfi: support multiple rounds of format negotiation.
...
Remove the temporary hack for amerge and replace it with a
generic solution.
2013-03-24 23:17:47 +01:00
Clément Bœsch
386dc9a3a8
lavfi/thumbnail: add support for named options.
2013-03-24 20:38:12 +01:00
Stefano Sabatini
1b140835b6
lavfi/colormatrix: add support for named options
2013-03-24 20:21:20 +01:00
Bojan Zivkovic
e54eb8db9c
mips: Optimization of AAC psychoacoustic model functions
...
Signed-off-by: Bojan Zivkovic <bojan@mips.com>
Reviewed-by: Nedeljko Babic <Nedeljko.Babic@imgtec.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-03-23 16:19:38 +01:00
Giorgio Vazzana
785b849f1c
lavd/v4l2: honor previously selected input channel
...
An input channel could have been previously set with another application, like
v4l2-ctl, so if no input channel is specified use the previosly selected one.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-03-23 13:43:56 +01:00
Michael Niedermayer
abbc34c372
Merge remote-tracking branch 'qatar/master'
...
* qatar/master:
configure: Enable hwaccels without external dependencies by default.
doc/developer: Clarify symbol naming prefixes section.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-03-22 12:58:22 +01:00
Clément Bœsch
77f60f0011
lavu/eval: add between() function.
2013-03-22 09:20:45 +01:00
Diego Biurrun
72ad96c854
doc/developer: Clarify symbol naming prefixes section.
2013-03-21 14:17:37 +01:00
Nicolas George
21b092de7c
lavfi: add sine audio source.
2013-03-20 21:04:28 +01:00
Nicolas George
8d928a9d99
lavu/opt: add AV_OPT_TYPE_DURATION.
2013-03-20 21:04:28 +01:00
Nicolas George
de1a71595d
lavf/concatdec: support seeking.
2013-03-20 20:59:24 +01:00
Paul B Mahol
7aa9af51db
lavu/opt: add AV_OPT_VIDEO_RATE option
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-03-20 12:29:54 +00:00
Bojan Zivkovic
7d29c6eebc
mips: Optimization of IIR filter function
...
Signed-off-by: Bojan Zivkovic <bojan@mips.com>
Reviewed-by: Nedeljko Babic <Nedeljko.Babic@imgtec.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-03-20 12:44:32 +01:00
Bojan Zivkovic
26f3924d78
mips: Optimization of AAC coefficients encoder functions
...
Signed-off-by: Bojan Zivkovic <bojan@mips.com>
Reviewed-by: Nedeljko Babic <Nedeljko.Babic@imgtec.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-03-20 12:34:37 +01:00
Michael Niedermayer
17ebef2fc8
Merge commit '2c328a907978b61949fd20f7c991803174337855'
...
* commit '2c328a907978b61949fd20f7c991803174337855':
pixdesc: add a function for counting planes in a pixel format.
avplay: remove the -debug option.
Revert "asfenc: return error on negative timestamp"
Conflicts:
doc/APIchanges
doc/ffplay.texi
ffplay.c
libavutil/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-03-20 11:24:11 +01:00
Paul B Mahol
17c1881d58
lavfi: remove harddup libmpcodecs wrapper
...
It is supposed to be used with mencoder only and does
nothing when used with ffmpeg.
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-03-19 17:15:53 +00:00
Clément Bœsch
1c3b428114
doc/developer: fix typo in regression tests ref.
2013-03-19 17:45:53 +01:00
Stefano Sabatini
18f43de964
doc/ffmpeg,ffmpeg-formats: avoid to mention ffmpeg options from formats.texi
...
Also extends documentation for timestamp related ffmpeg options, in order
to make more apparent the fact that muxer processing may change the
timestamps values.
2013-03-19 17:31:16 +01:00
Stefano Sabatini
2bac6b6f5e
doc/ffmpeg-formats: reword and extend documentation for avoid_negative_ts option
...
Hopefully increase readability.
2013-03-19 17:31:16 +01:00
Michael Niedermayer
d275f6eda8
doc: update release_notes by taking the ones from release/1.2
2013-03-19 16:21:26 +01:00
Anton Khirnov
2c328a9079
pixdesc: add a function for counting planes in a pixel format.
2013-03-19 11:12:17 +01:00
Anton Khirnov
e5c32d6da7
avplay: remove the -debug option.
...
It just shadows the corresponding AVOption and prevents using named
constants.
2013-03-19 11:12:13 +01:00
Michael Niedermayer
9c22039c15
doc: Document the order in which avoid_negative_ts is applied compared to other timestamp options
...
Also try to document the rational behind it.
This might fix Ticket2376
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-03-18 23:19:54 +01:00
Michael Niedermayer
aafbfb1c2e
doc: try to improve avoid_negative_ts documentation
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-03-18 23:09:26 +01:00
Michael Niedermayer
330e440706
Merge remote-tracking branch 'qatar/master'
...
* qatar/master:
print_options: do not generate docs for options without enc or dec flags
mpeg12: do not fail on zero dimensions in the sequence header.
Conflicts:
libavcodec/mpeg12.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-03-18 17:43:43 +01:00
Anton Khirnov
358628074c
print_options: do not generate docs for options without enc or dec flags
...
Those are not usable from the avtools, so mentioning them in the
manpages just confuses the reader.
2013-03-18 15:36:25 +01:00
Clément Bœsch
76d1c07c89
lavfi/ebur128: add metadata injection.
2013-03-18 03:21:08 +01:00
Michael Niedermayer
ef3c88838e
doc/developer: Add "security fixes" to the release process steps
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-03-17 22:53:28 +01:00
Nicolas George
40ea006b76
ffmpeg: make -lavfi an alias for -filter_complex.
2013-03-17 16:24:43 +01:00
Michael Niedermayer
ac1cea55ad
Merge commit '23f4c5acc438366d84cacf49e33b0bcd72f04937'
...
* commit '23f4c5acc438366d84cacf49e33b0bcd72f04937':
document the release process
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-03-17 12:58:44 +01:00
Marton Balint
e96175ad7b
ffplay: add -af option
...
Based on a patch by Stefano Sabatini <stefasab@gmail.com>:
http://ffmpeg.org/pipermail/ffmpeg-devel/2013-February/138452.html
Signed-off-by: Marton Balint <cus@passwd.hu>
2013-03-17 03:43:36 +01:00
Stefano Sabatini
f7ab23b0d0
ffprobe: remove deprecated frame "reference" field
2013-03-17 00:27:48 +01:00
Stefano Sabatini
db36ea5b5e
lavfi/settb: add support for named options
2013-03-17 00:27:33 +01:00
Stefano Sabatini
0407a79e41
lavfi/blackframe: add support for named options
2013-03-17 00:27:08 +01:00
Stefano Sabatini
356922e237
doc/filters: add bit-slicing example in lutyuv docs
2013-03-17 00:26:31 +01:00
Stefano Sabatini
b2098d2417
lavu/eval: add bitor and bitand functions
...
Warning note suggested by Reimar.
2013-03-17 00:22:47 +01:00
Reinhard Tartler
23f4c5acc4
document the release process
2013-03-16 18:00:54 +01:00
Michael Niedermayer
ecade984ac
Merge commit '42c7c61ab25809620b8c8809b3da73e25f5bbaaf'
...
* commit '42c7c61ab25809620b8c8809b3da73e25f5bbaaf':
avfiltergraph: replace AVFilterGraph.filter_count with nb_filters
Conflicts:
doc/APIchanges
libavfilter/avfiltergraph.c
libavfilter/avfiltergraph.h
libavfilter/graphparser.c
libavfilter/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-03-16 16:09:37 +01:00
Clément Bœsch
3b2b636a2a
lavfi: add perms and aperms filters.
2013-03-16 16:04:59 +01:00
Anton Khirnov
ef4d34aa7e
filters.texi: restore mistakenly removed section name for noformat
2013-03-16 05:35:02 +01:00
Anton Khirnov
42c7c61ab2
avfiltergraph: replace AVFilterGraph.filter_count with nb_filters
...
This is more consistent with the naming in the rest of Libav.
2013-03-16 05:33:23 +01:00
Clément Bœsch
db670e5366
lavfi/ebur128: add framelog option.
2013-03-15 02:35:26 +01:00
Stefano Sabatini
9bb25dbd13
examples/filtering_*: constify AVFrame * for print_frame() and display_frame() functions
2013-03-14 21:39:15 +01:00
Stefano Sabatini
9076a6a943
examples/filtering_audio: update to new API
...
In particular, fix crash.
2013-03-14 21:39:09 +01:00
Stefano Sabatini
f0da370a52
examples/filtering_video: update to new API
...
In particular, fix crash.
2013-03-14 21:39:01 +01:00
Stefano Sabatini
ae732640ab
lavfi/cropdetect: add support for named options
2013-03-13 20:38:54 +01:00
Stefano Sabatini
aeac1dae29
lavfi/fieldorder: add support to named options
2013-03-13 00:37:13 +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
Nicolas George
ceac5c54dd
Remove references to the "ff" variant of buffersink.
2013-03-12 23:31:07 +01:00
Michael Niedermayer
5743095ca9
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>
2013-03-12 18:10:35 +01:00
Michael Niedermayer
a75f01d7e0
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>
2013-03-12 15:35:39 +01:00
Michael Niedermayer
80e9e63c94
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>
2013-03-12 03:23:28 +01:00
Stefano Sabatini
35135a3989
lavfi/smartblur: add support to named options
2013-03-10 16:38:45 +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
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
Clément Bœsch
65fc80f012
lavfi: add curves filter.
2013-03-10 03:00:10 +01:00
Clément Bœsch
5e4bc96415
doc: fix examples.
2013-03-10 01:41:53 +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
2013-03-10 01:40:35 +01:00
Michael Niedermayer
6c17ff84ad
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>
2013-03-08 14:57:41 +01:00
Anton Khirnov
d8b31be6ca
Add the bumps and APIchanges entries for reference counted buffers changes.
2013-03-08 07:41:49 +01:00
