summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
...
| * mpegvideo: increase edge_emu_buffer size for VC1Janne Grunau2012-12-19
| | | | | | | | | | | | | | | | | | The VC1 decoder uses edge_emu_buffer simultaneously for luma and chroma and needs more space. That was not a problem before f1d8763a02b5fce 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.
| * lavc: merge latest x86inc.asm fixes with x264Ronald S. Bultje2012-12-19
| | | | | | | | | | | | Unbreak NASM support. Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
* | Merge commit 'acb571c89a065d943163c11efb46de35774f1909'Michael Niedermayer2012-12-20
|\| | | | | | | | | | | | | | | | | | | | | | | | | * 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>
| * avcodec: bump minor for adaptive h264 frame-mtJanne Grunau2012-12-18
| | | | | | | | Also adds forgotten Changelog entry.
| * avconv: pass the actually selected decoder to filter_codec_opts().Anton Khirnov2012-12-18
| |
* | cmdutils: implement debug/fdebug log level update differently.Michael Niedermayer2012-12-20
| | | | | | | | | | | | | | The old implementation is no longer possibly due to limitations of the new command line parser. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit '77bd1bc73a1946b0f0ce09a7cbb242a65e138d06'Michael Niedermayer2012-12-20
|\| | | | | | | | | | | | | | | | | | | | | | | * commit '77bd1bc73a1946b0f0ce09a7cbb242a65e138d06': avconv: use new options parser. Conflicts: ffmpeg.c ffmpeg.h ffmpeg_opt.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * avconv: use new options parser.Anton Khirnov2012-12-18
| |
* | doc/faq: move filter links to the ffmpeg-filters.html page.Clément Bœsch2012-12-20
| |
* | doc/faq: improve concatenation entry.Clément Bœsch2012-12-20
| |
* | ffmpeg: use GROW_ARRAY in opt_map_channel.Clément Bœsch2012-12-19
| |
* | Merge commit '0ec1642b60a5b1a4d913e2b9e3899173dff77e7a'Michael Niedermayer2012-12-19
|\| | | | | | | | | | | | | * commit '0ec1642b60a5b1a4d913e2b9e3899173dff77e7a': cmdutils: don't log an error in opt_default(). Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * cmdutils: don't log an error in opt_default().Anton Khirnov2012-12-18
| | | | | | | | It results in spurious errors when using the new preparser.
* | Merge commit '8c9af5b2051b9927f845c7afdfeb30b82670ee77'Michael Niedermayer2012-12-19
|\| | | | | | | | | | | | | * commit '8c9af5b2051b9927f845c7afdfeb30b82670ee77': cmdutils: add a commandline pre-parser. Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * cmdutils: add a commandline pre-parser.Anton Khirnov2012-12-18
| | | | | | | | | | | | | | | | | | | | | | | | | | It splits the commandline into a more convenient internal representation for further parsing. This will allow e.g. - processing global options first independently of their location on the commandline, eliminating ugly hacks for processing e.g. cpuflags first - better options validation and error reporting. It is now possible for the parser to know that it's applying an input option to an output file or vice versa and act accordingly.
* | Merge commit 'a01c02bcff755a7891f777706b27452203aac71e'Michael Niedermayer2012-12-19
|\| | | | | | | | | | | | | * commit 'a01c02bcff755a7891f777706b27452203aac71e': cmdutils: split parse_option(). Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * cmdutils: split parse_option().Anton Khirnov2012-12-18
| | | | | | | | | | | | Separate the code that searches for the option to use and the code that actually writes it. The writing code will be reused by the new options parser.
* | Merge commit '10bca66101b79954512cd9d8ee20c3bc4513adf3'Michael Niedermayer2012-12-19
|\| | | | | | | | | | | | | * commit '10bca66101b79954512cd9d8ee20c3bc4513adf3': cmdutils: add a macro to simplify grow_array() calls. Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * cmdutils: add a macro to simplify grow_array() calls.Anton Khirnov2012-12-18
| |
* | Merge commit '9e696d2e5ffaa763c564682ec18c3b51b3e5fccc'Michael Niedermayer2012-12-19
|\| | | | | | | | | | | | | | | | | | | | | | | 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>
| * h264: support frame parameter changes during frame-mtJanne Grunau2012-12-18
| | | | | | | | Fixes CVE-2012-2782.
* | h264: use must_reinit to simplify codeMichael Niedermayer2012-12-19
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | h264: decode_update_thread_context() copy parameter sets before using themMichael Niedermayer2012-12-19
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | h264: remove reschange blockingMichael Niedermayer2012-12-19
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | h264: support frame size changes with multi threadingMichael Niedermayer2012-12-19
| | | | | | | | | | | | Based on code by Janne Grunau Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | ffmpeg_filter: use frame instead of decoder context pixel formatMichael Niedermayer2012-12-19
| | | | | | | | | | | | prevents regressions from h264-mt frame size changing code Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | ffmpeg_filter: use frame dimensions instead of decoder context dimensions.Michael Niedermayer2012-12-19
| | | | | | | | | | | | avoids regression from the h264-mt frame size change code. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | h264: move h264_set_parameter_from_sps() call upMichael Niedermayer2012-12-19
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | h264: move list_count and current_slice reset to flush_change()Michael Niedermayer2012-12-19
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | h264: split flush_change() out of flush_dpb()Michael Niedermayer2012-12-19
| | | | | | | | | | Based on a patch by Janne Grunau Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | h264: factor get_pixel_format() outMichael Niedermayer2012-12-19
| | | | | | | | | | | | Based on patch by Janne Grunau Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | au: return meaningful error codesPaul B Mahol2012-12-19
| | | | | | | | Signed-off-by: Paul B Mahol <onemda@gmail.com>
* | pp: fix a few typo in the template.Clément Bœsch2012-12-19
| |
* | pvfdec: drop pointless casting of buffer in ff_get_line()Paul B Mahol2012-12-19
| | | | | | | | Signed-off-by: Paul B Mahol <onemda@gmail.com>
* | Merge commit 'f1d8763a02b5fce9a7d9789e049d74a45b15e1e8'Michael Niedermayer2012-12-19
|\| | | | | | | | | | | | | | | | | | | * commit 'f1d8763a02b5fce9a7d9789e049d74a45b15e1e8': mpegvideo: allocate scratch buffers after linesize is known Conflicts: libavcodec/mpegvideo.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * mpegvideo: allocate scratch buffers after linesize is knownJanne Grunau2012-12-18
| | | | | | | | | | | | | | | | | | | | | | Since we can't know which stride a custom get_buffer() implementation is going to use we have to allocate this scratch buffers after the linesize is known. It was pretty safe for 8 bit per pixel pixel formats since we always allocated memory for up to 16 bits per pixel. It broke hoever with cmdutis.c's alloc_buffer() and high pixel bit depth since it allocated larger edges than mpegvideo expected. Fixes fuzzed sample nasa-8s2.ts_s244342.
* | Merge commit 'ed2d7d5868a4a5d914f1e5488d63ea696a3b2937'Michael Niedermayer2012-12-19
|\| | | | | | | | | | | | | | | * 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>
| * ff_h264_direct_ref_list_init: fix B slice check.Michael Niedermayer2012-12-18
| | | | | | | | | | | | Fixes null pointer dereference. Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
| * h264: increase dist_scale_factor for up to 32 referencesJanne Grunau2012-12-18
| | | | | | | | | | Compute dist_scale_factor_field only for MBAFF since that is the only case in which it is used.
* | Merge commit '523c7bd23c781aa0f3a85044896f5e18e8b52534'Michael Niedermayer2012-12-19
|\| | | | | | | | | | | | | | | | | | | | | * commit '523c7bd23c781aa0f3a85044896f5e18e8b52534': misc typo, style and wording fixes Conflicts: libavcodec/options_table.h libavutil/pixfmt.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * misc typo, style and wording fixesDiego Biurrun2012-12-18
| |
* | doc: remove mention of fifo filter in the introduction.Clément Bœsch2012-12-19
| | | | | | | | It's confusing and not necessary, especially in the introduction.
* | lavfi/setpts: enable debug logs, and improve/extend debug messagesStefano Sabatini2012-12-19
| |
* | Show underscores in av_get_codec_tag_string().Carl Eugen Hoyos2012-12-19
| |
* | doc: extend "See Also" chapters in library manualsStefano Sabatini2012-12-19
| | | | | | | | In particular, make "See Also" chapter rendered in HTML output.
* | doc: extend "See Also" chapters in component manualsStefano Sabatini2012-12-19
| | | | | | | | In particular, make "See Also" chapter rendered in HTML output.
* | doc: extend "See Also" chapter rendering for ff* toolsStefano Sabatini2012-12-19
| | | | | | | | | | | | 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.
* | doc: rework synopsis section for ff* toolsStefano Sabatini2012-12-19
| | | | | | | | | | Fix syntax, remove pointless introductory sentence, improve overall consistency.
* | doc: use a common authors.texi file blurbStefano Sabatini2012-12-19
| | | | | | | | Factorize.
* | doc/texi2pod: rework man inclusion logicStefano Sabatini2012-12-19
| | | | | | | | | | | | | | | | | | | | | | 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.