summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Merge commit '6d97484d72e33f7dde9493a9ead1a72e2f029605'Michael Niedermayer2013-03-1437-104/+107
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '6d97484d72e33f7dde9493a9ead1a72e2f029605': avcodec: av_log_ask_for_sample() ---> avpriv_request_sample() rsodec: Use avpriv_report_missing_feature() where appropriate Conflicts: libavcodec/anm.c libavcodec/mlpdec.c libavcodec/pictordec.c libavcodec/sunrast.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * avcodec: av_log_ask_for_sample() ---> avpriv_request_sample()Diego Biurrun2013-03-1336-104/+107
| |
| * rsodec: Use avpriv_report_missing_feature() where appropriateDiego Biurrun2013-03-131-1/+1
| |
* | Merge commit '1ecdf8912b9ced51b3267cdcdce5e394d0a3bf8e'Michael Niedermayer2013-03-1418-37/+39
|\ \ | |/ | | | | | | | | | | | | | | | | * commit '1ecdf8912b9ced51b3267cdcdce5e394d0a3bf8e': avformat: av_log_ask_for_sample() ---> avpriv_request_sample() Conflicts: libavformat/mxfdec.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * avformat: av_log_ask_for_sample() ---> avpriv_request_sample()Diego Biurrun2013-03-1318-38/+38
| |
* | Merge commit '63d744e2be39466e3a734c2987cd713e0bac101e'Michael Niedermayer2013-03-1417-22/+29
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | * commit '63d744e2be39466e3a734c2987cd713e0bac101e': av_log_missing_feature() ---> avpriv_report_missing_feature() Conflicts: libavcodec/aacdec.c libavcodec/tta.c libavformat/mpegts.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * av_log_missing_feature() ---> avpriv_report_missing_feature()Diego Biurrun2013-03-1318-23/+30
| |
* | Merge commit 'f099d3d1d5466bd63f4ab36270d169ff9ea613b8'Michael Niedermayer2013-03-146-2/+85
|\ \ | |/ | | | | | | | | | | | | * commit 'f099d3d1d5466bd63f4ab36270d169ff9ea613b8': Add av_log_{ask_for_sample|missing_feature} replacements to libavutil ismindex: Check the return value of allocations Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * Add av_log_{ask_for_sample|missing_feature} replacements to libavutilDiego Biurrun2013-03-135-0/+72
| | | | | | | | | | This allows reporting missing features and requesting samples from all libraries in a standard way; with a simplified API.
| * ismindex: Check the return value of allocationsMartin Storsjö2013-03-131-2/+13
| | | | | | | | Signed-off-by: Martin Storsjö <martin@martin.st>
* | Merge commit '7c147900b86c0f1cf030b7b844c670649c80c191'Michael Niedermayer2013-03-141-22/+19
|\ \ | |/ | | | | | | | | | | * commit '7c147900b86c0f1cf030b7b844c670649c80c191': ismindex: Factorize code for printing chunk duration lists Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * ismindex: Factorize code for printing chunk duration listsMartin Storsjö2013-03-131-22/+19
| | | | | | | | Signed-off-by: Martin Storsjö <martin@martin.st>
* | Merge commit 'f05e9beb4ab5fb8b9d5ba81405e9fca901832591'Michael Niedermayer2013-03-141-149/+149
|\ \ | |/ | | | | | | | | | | | | | | | | | | * commit 'f05e9beb4ab5fb8b9d5ba81405e9fca901832591': ismindex: Rename structs and fields from "file" to "track" avpacket: copy side data type and size in av_dup_packet Conflicts: libavcodec/avpacket.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * ismindex: Rename structs and fields from "file" to "track"Martin Storsjö2013-03-131-149/+149
| | | | | | | | | | | | | | The tool nowadays supports more than one track per file, this makes reading the code slightly less confusing. Signed-off-by: Martin Storsjö <martin@martin.st>
| * avpacket: copy side data type and size in av_dup_packetJanne Grunau2013-03-131-1/+4
| |
* | lavc: do not set coded_frame->referencePaul B Mahol2013-03-146-6/+0
| | | | | | | | | | | | That field is deprecated. Signed-off-by: Paul B Mahol <onemda@gmail.com>
* | Revert "lavfi/ebur128: fix format negociation for output."Clément Bœsch2013-03-141-0/+16
| | | | | | | | | | | | | | This reverts commit 9efcfbed9dd64679145f5f39d9a812dfeea97172. All the shame on me; this commit is actually causing more problems (broken outputs but also crashes) than it was solving.
* | lavfi/ebur128: fix format negociation for output.Clément Bœsch2013-03-141-16/+0
| | | | | | | | | | | | | | | | | | Before this change, the audio input and output formats are set independently, so the lavfi negociation could pick different settings for the input and output. This is particularly true for the channel layout settings, where multiple choices were available. Fixes Ticket2342.
* | lavfi/thumbnail: support flushing.Clément Bœsch2013-03-142-37/+64
| | | | | | | | | | | | | | This makes possible the raise of one picture if the input has less than the number of frames to analyze. Fixes Ticket1992.
* | lavfi/avcodec: fix API version checksHendrik Leppkes2013-03-132-2/+2
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | lavfi/avcodec: cleanup includesHendrik Leppkes2013-03-132-1/+1
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | tiff: fix handling of metadata with refcounted framesHendrik Leppkes2013-03-131-18/+14
| | | | | | | | | | | | | | | | | | | | | | Since the conversion to refcounted frames, the tiff decoder only wrote the metadata into its internal "picture" in its own context, never exposing the metadata to the user, and eventually leaking the metadata. Instead, properly store the metadata directly into the frame being decoded into. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | yadif: restore speed of the C filtering codeJames Darnley2013-03-133-49/+37
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Always use the special filter for the first and last 3 columns (only). Changes made in 64ed397 slowed the filter to just under 3/4 of what it was. This commit restores the speed while maintaining identical output. For reference, on my Athlon64: 1733222 decicycles in old 2358563 decicycles in new 1727558 decicycles in this Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | lavfi/cropdetect: add support for named optionsStefano Sabatini2013-03-133-24/+45
| |
* | lavu/frame: free frame metadata when unrefing a frame.Hendrik Leppkes2013-03-131-0/+1
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec: remove AVCodecContext->metadataHendrik Leppkes2013-03-132-10/+0
| | | | | | | | | | | | | | | | | | This field was only ever set and freed from avcodec, and not otherwise used. However, because frames are refcounted now, avcodec cannot make any assumptions about the lifetime of the frame metadata, which can result in double-frees or leaked memory. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | lavfi/delogo: remove sscanf and rely on av_opt_set_from_string() only.Clément Bœsch2013-03-131-8/+5
| |
* | lavc/crystalhd: remove now unecessary buffer_hints.Clément Bœsch2013-03-131-2/+0
| |
* | lavc: factorize ff_{thread_,re,}get_buffer error messages.Clément Bœsch2013-03-13191-669/+273
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Coccinelle profile used: @@ expression r, ctx, f, loglevel, str, flags; @@ -if ((r = ff_get_buffer(ctx, f, flags)) < 0) { - av_log(ctx, loglevel, str); - return r; -} +if ((r = ff_get_buffer(ctx, f, flags)) < 0) + return r; @@ expression r, ctx, f, loglevel, str; @@ -if ((r = ff_reget_buffer(ctx, f)) < 0) { - av_log(ctx, loglevel, str); - return r; -} +if ((r = ff_reget_buffer(ctx, f)) < 0) + return r; @@ expression r, ctx, f, loglevel, str, flags; @@ -if ((r = ff_thread_get_buffer(ctx, f, flags)) < 0) { - av_log(ctx, loglevel, str); - return r; -} +if ((r = ff_thread_get_buffer(ctx, f, flags)) < 0) + return r; ...along with some manual patches for the remaining ones.
* | lavfi/thumbnail: remove unecessary poll_frame() callback.Clément Bœsch2013-03-131-23/+0
| |
* | lavfi/mptestsrc: raise filter_frame() error.Clément Bœsch2013-03-131-3/+1
| |
* | lavfi/mandelbrot: raise filter_frame() error.Clément Bœsch2013-03-131-3/+1
| |
* | lavfi/life: raise filter_frame() error.Clément Bœsch2013-03-131-3/+1
| |
* | lavfi/cellauto: raise filter_frame() error.Clément Bœsch2013-03-131-3/+1
| |
* | lavfi/alphamerge: raise filter_frame() error.Clément Bœsch2013-03-131-4/+5
| |
* | lavfi/movie: raise filter_frame() error.Clément Bœsch2013-03-131-1/+3
| |
* | lavfi/buffersrc: raise filter_frame() error.Clément Bœsch2013-03-131-5/+1
| |
* | lavfi/showspectrum: raise filter_frame() error.Clément Bœsch2013-03-131-8/+13
| |
* | lavfi/avfilter: raise filter_frame() error.Clément Bœsch2013-03-131-2/+1
| |
* | lavfi/concat: raise filter_frame() error.Clément Bœsch2013-03-131-19/+32
| |
* | lavfi/anullsrc: raise filter_frame() error.Clément Bœsch2013-03-131-2/+3
| |
* | lavfi/aevalsrc: raise filter_frame() error.Clément Bœsch2013-03-131-3/+1
| |
* | lavfi/atempo: raise filter_frame() error.Clément Bœsch2013-03-131-7/+16
| |
* | lavfi/asetnsamples: raise filter_frame() error.Clément Bœsch2013-03-131-5/+9
| |
* | lavfi/aresample: raise filter_frame() error.Clément Bœsch2013-03-131-2/+1
| |
* | lavu/frame: av_frame_make_writable: set the channels on the new frame.Hendrik Leppkes2013-03-131-0/+1
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | lavu/frame: copy all frame properties in av_frame_copy_propsHendrik Leppkes2013-03-131-0/+6
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | dsputil: remove deprecated dsp_mask usageHendrik Leppkes2013-03-131-7/+0
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | dsputil_mmx: remove unused variablesMichael Niedermayer2013-03-131-2/+0
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | exr: silence warning "libavcodec/exr.c:351:9: warning: variable ret set but ↵Michael Niedermayer2013-03-131-1/+2
| | | | | | | | | | | | not used" Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
View Lorry Controller Status