Michael Niedermayer
1667152a9c
Merge commit 'acb571c89a065d943163c11efb46de35774f1909'
...
* commit 'acb571c89a065d943163c11efb46de35774f1909':
avcodec: bump minor for adaptive h264 frame-mt
avconv: pass the actually selected decoder to filter_codec_opts().
Conflicts:
Changelog
ffmpeg_opt.c
libavcodec/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
12 years ago
Michael Niedermayer
ba4bcb191a
cmdutils: implement debug/fdebug log level update differently.
...
The old implementation is no longer possibly due to limitations
of the new command line parser.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years ago
Michael Niedermayer
af4b1c02ac
Merge commit '77bd1bc73a1946b0f0ce09a7cbb242a65e138d06'
...
* commit '77bd1bc73a1946b0f0ce09a7cbb242a65e138d06':
avconv: use new options parser.
Conflicts:
ffmpeg.c
ffmpeg.h
ffmpeg_opt.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
12 years ago
Justin Ruggles
b2fe6756e3
lavr: add option for dithering during sample format conversion to s16
12 years ago
Clément Bœsch
52b866471e
doc/faq: move filter links to the ffmpeg-filters.html page.
12 years ago
Clément Bœsch
521a963a7d
doc/faq: improve concatenation entry.
12 years ago
Clément Bœsch
cb0881c794
ffmpeg: use GROW_ARRAY in opt_map_channel.
12 years ago
Michael Niedermayer
61bc3d80e9
Merge commit '0ec1642b60a5b1a4d913e2b9e3899173dff77e7a'
...
* commit '0ec1642b60a5b1a4d913e2b9e3899173dff77e7a':
cmdutils: don't log an error in opt_default().
Merged-by: Michael Niedermayer <michaelni@gmx.at>
12 years ago
Michael Niedermayer
33f9b2436a
Merge commit '8c9af5b2051b9927f845c7afdfeb30b82670ee77'
...
* commit '8c9af5b2051b9927f845c7afdfeb30b82670ee77':
cmdutils: add a commandline pre-parser.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
12 years ago
Anton Khirnov
5823686261
mpeg12: do not decode extradata more than once.
...
Fixes CVE-2012-2803.
CC: libav-stable@libav.org
12 years ago
Michael Niedermayer
465c7de792
Merge commit 'a01c02bcff755a7891f777706b27452203aac71e'
...
* commit 'a01c02bcff755a7891f777706b27452203aac71e':
cmdutils: split parse_option().
Merged-by: Michael Niedermayer <michaelni@gmx.at>
12 years ago
Anton Khirnov
c661cb6672
cmdutils: pass number of groups to split_commandline().
...
This makes the code simpler and avoids mixing designated and
non-designated initializers in a potentially unsafe way in avconv.
12 years ago
Michael Niedermayer
330983b728
Merge commit '10bca66101b79954512cd9d8ee20c3bc4513adf3'
...
* commit '10bca66101b79954512cd9d8ee20c3bc4513adf3':
cmdutils: add a macro to simplify grow_array() calls.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
12 years ago
Michael Niedermayer
f61498e1df
Merge commit '9e696d2e5ffaa763c564682ec18c3b51b3e5fccc'
...
Merge only for metadata, functionality had been previously integrated.
* commit '9e696d2e5ffaa763c564682ec18c3b51b3e5fccc':
h264: support frame parameter changes during frame-mt
Conflicts:
libavcodec/h264.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
12 years ago
Michael Niedermayer
ca4dd3810e
h264: use must_reinit to simplify code
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years ago
Michael Niedermayer
af0fafcb6f
h264: decode_update_thread_context() copy parameter sets before using them
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years ago
Michael Niedermayer
e33811bd26
h264: remove reschange blocking
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years ago
Michael Niedermayer
c2dfb1e37c
h264: support frame size changes with multi threading
...
Based on code by Janne Grunau
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years ago
Michael Niedermayer
7e6c68394f
ffmpeg_filter: use frame instead of decoder context pixel format
...
prevents regressions from h264-mt frame size changing code
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years ago
Michael Niedermayer
04a530f7d3
ffmpeg_filter: use frame dimensions instead of decoder context dimensions.
...
avoids regression from the h264-mt frame size change code.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years ago
Michael Niedermayer
8ea4a5533f
h264: move h264_set_parameter_from_sps() call up
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years ago
Michael Niedermayer
afc03268b4
h264: move list_count and current_slice reset to flush_change()
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years ago
Michael Niedermayer
971c469a0d
h264: split flush_change() out of flush_dpb()
...
Based on a patch by Janne Grunau
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years ago
Michael Niedermayer
25a0af51da
h264: factor get_pixel_format() out
...
Based on patch by Janne Grunau
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years ago
Paul B Mahol
76877beada
au: return meaningful error codes
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
12 years ago
Clément Bœsch
a1d14336d3
pp: fix a few typo in the template.
12 years ago
Paul B Mahol
d85854b269
pvfdec: drop pointless casting of buffer in ff_get_line()
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
12 years ago
Michael Niedermayer
642a655f7d
Merge commit 'f1d8763a02b5fce9a7d9789e049d74a45b15e1e8'
...
* commit 'f1d8763a02b5fce9a7d9789e049d74a45b15e1e8':
mpegvideo: allocate scratch buffers after linesize is known
Conflicts:
libavcodec/mpegvideo.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
12 years ago
Janne Grunau
bb2bab92e7
mov: handle h263 and flv1 for codec_tag 'H','2','6','3'
...
The sample in https://bugzilla.libav.org/show_bug.cgi?id=393 and
samples/F4V/H263_NM_f.mp4 both have codec_tag H263 for different
codecs. H263 is apparently used by Flash Media Server for Sorensen
Spark videos.
Patch based on commit 5442083b1c
by
Carl Eugen Hoyos. Fixes bug 393.
12 years ago
Michael Niedermayer
e84194f060
Merge commit 'ed2d7d5868a4a5d914f1e5488d63ea696a3b2937'
...
* commit 'ed2d7d5868a4a5d914f1e5488d63ea696a3b2937':
ff_h264_direct_ref_list_init: fix B slice check.
h264: increase dist_scale_factor for up to 32 references
Merged-by: Michael Niedermayer <michaelni@gmx.at>
12 years ago
Michael Niedermayer
af804dbe9e
Merge commit '523c7bd23c781aa0f3a85044896f5e18e8b52534'
...
* commit '523c7bd23c781aa0f3a85044896f5e18e8b52534':
misc typo, style and wording fixes
Conflicts:
libavcodec/options_table.h
libavutil/pixfmt.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
12 years ago
Victor Lopez
1c8bf3bfed
h264: fix sps parsing for SVC and CAVLC 4:4:4 Intra profiles
...
Fixes bug 396.
CC: libav-stable@libav.org
12 years ago
Clément Bœsch
80a9297b71
doc: remove mention of fifo filter in the introduction.
...
It's confusing and not necessary, especially in the introduction.
12 years ago
Stefano Sabatini
022e118e3f
lavfi/setpts: enable debug logs, and improve/extend debug messages
12 years ago
Carl Eugen Hoyos
ec4a084581
Show underscores in av_get_codec_tag_string().
12 years ago
Stefano Sabatini
c5d7c7d33b
doc: extend "See Also" chapters in library manuals
...
In particular, make "See Also" chapter rendered in HTML output.
12 years ago
Stefano Sabatini
9b323a9b95
doc: extend "See Also" chapters in component manuals
...
In particular, make "See Also" chapter rendered in HTML output.
12 years ago
Stefano Sabatini
9d6517aa67
doc: extend "See Also" chapter rendering for ff* tools
...
Add more references, and generate alternative variants for HTML and POD
output. In particular, this allows to render a "See Also" chapter in the
HTML output.
12 years ago
Stefano Sabatini
c2ac647710
doc: rework synopsis section for ff* tools
...
Fix syntax, remove pointless introductory sentence, improve overall
consistency.
12 years ago
Stefano Sabatini
461716d3bf
doc: use a common authors.texi file blurb
...
Factorize.
12 years ago
Stefano Sabatini
ca3d786227
doc/texi2pod: rework man inclusion logic
...
Ignore @c man begin ... @c man end comments, rely on @chapter for marking
the beginning of the various manual top level sections.
This allows us to write markup which is not dependent on the specific
texi2pod.pl implementation.
This change causes a few rendering issues, which will be fixed in further
patches.
12 years ago
Janne Grunau
45635885e4
mpegvideo: increase edge_emu_buffer size for VC1
...
The VC1 decoder uses edge_emu_buffer simultaneously for luma and chroma
and needs more space. That was not a problem before f1d8763a02
since the size for edge_emu_buffer was always calculated with 2 byte per
pixel since the linesize was not known.
Fixes occasionally fate errors in vc1_sa10143.
12 years ago
Ronald S. Bultje
a34d9ad969
lavc: merge latest x86inc.asm fixes with x264
...
Unbreak NASM support.
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
12 years ago
Michael Niedermayer
1166fc07a2
utils: fix duration calculation for strange_duration_example.ts
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years ago
Clément Bœsch
de2022c5dd
lavfi/gradfun: small align cosmetics.
12 years ago
Clément Bœsch
fea6f5e14d
doc/filters: reformat and rework gradfun.
...
Note that examples are changed.
12 years ago
Clément Bœsch
526e2415bd
lavfi/gradfun: support named options.
...
This breaks usage for out-of-range values.
12 years ago
Clément Bœsch
ca83e6ce26
fate: re-enable lavfi gradfun filter test.
12 years ago
Clément Bœsch
3bdd70fc66
lavfi/gradfun: reduce up limit for threshold.
...
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.
12 years ago
Clément Bœsch
63e1fc2588
lavfi/gradfun: remove rounding to match C and SSE code.
...
There is no noticable benefit for such precision.
12 years ago