aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* | lavc: clarify docs for avpkt->destructMichael Bradshaw2012-06-271-5/+6
| | | | | | | | | | | | | | | | avcodec_encode_audio2 docs are ambiguous about avpkt->destruct and imply it gets reset. Signed-off-by: Michael Bradshaw <mbradshaw@sorensonmedia.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-06-2739-135/+169
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: avconv: add an assert to silence an uninitialized variable warning. avconv: shut up an uninitialized variable warning. avfiltergraph: shut up uninitialized variable warning. af_join: initialize a variable to shut up gcc warning. amix: fix format specifier for AVFilterLink.sample_rate. lavfi: make filters less verbose. mpc8: read APE tags. lavr: x86: fix ff_conv_fltp_to_flt_6ch function prototypes libm: provide fallback definition for cbrtf() using powf() network: Don't redefine error codes if they already exist in errno.h configure: Check for sys/time.h network: Include unistd.h from network.h avconv: don't include vsrc_buffer.h, which doesn't exist anymore lavfi: reorder AVFilterLink fields. lavfi: reorder AVFilterContext fields. lavfi: reorder AVFilter fields. lavfi: reorder AVFilterBufferRef fields. lavfi: reorder AVFilterBuffer fields. Conflicts: configure libavcodec/v210dec.h libavfilter/asrc_anullsrc.c libavfilter/avfilter.h libavfilter/buffersrc.c libavfilter/src_movie.c libavfilter/vf_aspect.c libavfilter/vf_crop.c libavfilter/vf_drawbox.c libavfilter/vf_fade.c libavfilter/vf_overlay.c libavfilter/vf_pad.c libavfilter/vf_scale.c libavfilter/vsrc_color.c libavformat/network.h libavutil/libm.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * avconv: add an assert to silence an uninitialized variable warning.Anton Khirnov2012-06-261-0/+1
| | | | | | | | | | | | | | The warning silenced was: avconv.c: In function ‘opt_output_file’: avconv.c:3380:21: warning: ‘meta_out’ may be used uninitialized in this function [-Wuninitialized] avconv.c:3315:20: note: ‘meta_out’ was declared here
| * avconv: shut up an uninitialized variable warning.Anton Khirnov2012-06-261-1/+3
| | | | | | | | | | | | | | The warning silenced was: avconv.c: In function ‘configure_filtergraph’: avconv.c:603:8: warning: ‘ist’ may be used uninitialized in this function [-Wuninitialized] avconv.c:549:18: note: ‘ist’ was declared here
| * avfiltergraph: shut up uninitialized variable warning.Anton Khirnov2012-06-261-1/+3
| | | | | | | | | | | | The warning silenced was: libavfilter/avfiltergraph.c: In function ‘avfilter_graph_config’: libavfilter/avfiltergraph.c:500:13: warning: ‘best_idx’ may be used uninitialized in this function [-Wuninitialized]
| * af_join: initialize a variable to shut up gcc warning.Anton Khirnov2012-06-261-1/+2
| | | | | | | | | | | | The warning silenced was: libavfilter/af_join.c: In function ‘join_request_frame’: libavfilter/af_join.c:451:9: warning: ‘nb_samples’ may be used uninitialized in this function [-Wuninitialized]
| * amix: fix format specifier for AVFilterLink.sample_rate.Anton Khirnov2012-06-261-1/+1
| | | | | | | | It is a plain int now.
| * lavfi: make filters less verbose.Anton Khirnov2012-06-2626-38/+37
| |
| * mpc8: read APE tags.Anton Khirnov2012-06-262-1/+8
| |
| * lavr: x86: fix ff_conv_fltp_to_flt_6ch function prototypesJustin Ruggles2012-06-261-3/+6
| | | | | | | | | | | | Changed to match the number of parameters in conv_func_interleave(), which is how they are called. The change isn't strictly necessary because the 4th parameter is not used, but the code is clearer if they match.
| * libm: provide fallback definition for cbrtf() using powf()Mans Rullgard2012-06-262-0/+9
| | | | | | | | | | | | | | | | This adds a fallback for cbrtf() using powf(x, 1/3). Since powf() with a non-integer exponent requires a non-negative base, special handling of negative inputs is needed. Signed-off-by: Mans Rullgard <mans@mansr.com>
| * network: Don't redefine error codes if they already exist in errno.hRonald S. Bultje2012-06-262-0/+17
| | | | | | | | | | | | | | | | Since the errno.h values don't match the error codes that winsock returns, map the winsock error codes to the errno ones, to make sure explicit checks against AVERROR(x) match. Signed-off-by: Martin Storsjö <martin@martin.st>
| * configure: Check for sys/time.hRonald S. Bultje2012-06-262-0/+4
| | | | | | | | | | | | | | | | Apparently this include is needed on some systems for building the poll fallback (for the timeval struct for select?), but it isn't available on all systems. Thus only include it if it exists. Signed-off-by: Martin Storsjö <martin@martin.st>
| * network: Include unistd.h from network.hMartin Storsjö2012-06-264-3/+4
| | | | | | | | | | | | | | | | | | | | | | This heaader is required for close() for sockets in network code. For winsock, the equivalent function is defined in the winsock2.h header. This avoids having the HAVE_UNISTD_H in all files dealing with raw sockets. Signed-off-by: Martin Storsjö <martin@martin.st>
| * avconv: don't include vsrc_buffer.h, which doesn't exist anymoreAnton Khirnov2012-06-261-1/+0
| |
| * lavfi: reorder AVFilterLink fields.Anton Khirnov2012-06-261-27/+27
| | | | | | | | Move private fields to the private section, remove holes.
| * lavfi: reorder AVFilterContext fields.Anton Khirnov2012-06-261-7/+6
| | | | | | | | Place related fields together, remove holes.
| * lavfi: reorder AVFilter fields.Anton Khirnov2012-06-261-9/+17
| | | | | | | | | | Place related fields together, remove holes, move private fields to the end and mark them as private.
| * lavfi: reorder AVFilterBufferRef fields.Anton Khirnov2012-06-261-17/+18
| | | | | | | | Place related fields together, remove holes.
| * lavfi: reorder AVFilterBuffer fields.Anton Khirnov2012-06-261-16/+15
| | | | | | | | Place related fields together, remove holes.
* | Merge commit '1961e46c15c23a041f8d8614a25388a3ee9eff63'Michael Niedermayer2012-06-2712-388/+9
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '1961e46c15c23a041f8d8614a25388a3ee9eff63': lavfi: remove disabled FF_API_FILTERS_PUBLIC cruft lavfi: remove disabled FF_API_DEFAULT_CONFIG_OUTPUT_LINK cruft lavfi: use proper FF_API guards for different deprecated functions lavfi: remove disabled FF_API_VSRC_BUFFER_ADD_FRAME cruft lavfi: remove disabled FF_API_SAMPLERATE64 cruft lavfi: remove disabled FF_API_GRAPH_AVCLASS cruft Conflicts: libavfilter/avfilter.c libavfilter/avfilter.h libavfilter/buffersrc.c libavfilter/formats.c libavfilter/graphparser.c libavfilter/version.h libavfilter/video.c libavfilter/vsrc_buffer.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * lavfi: remove disabled FF_API_FILTERS_PUBLIC cruftAnton Khirnov2012-06-266-245/+0
| |
| * lavfi: remove disabled FF_API_DEFAULT_CONFIG_OUTPUT_LINK cruftAnton Khirnov2012-06-263-15/+0
| |
| * lavfi: use proper FF_API guards for different deprecated functionsAnton Khirnov2012-06-261-0/+2
| |
| * lavfi: remove disabled FF_API_VSRC_BUFFER_ADD_FRAME cruftAnton Khirnov2012-06-264-61/+0
| |
| * lavfi: remove disabled FF_API_SAMPLERATE64 cruftAnton Khirnov2012-06-263-11/+0
| |
| * lavfi: remove disabled FF_API_GRAPH_AVCLASS cruftAnton Khirnov2012-06-264-20/+6
| |
* | Merge commit 'a5e8c41c28f907d98d2a739db08f7aef4cbfcf3a'Michael Niedermayer2012-06-2665-118/+126
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'a5e8c41c28f907d98d2a739db08f7aef4cbfcf3a': lavfi: remove 'opaque' parameter from AVFilter.init() mov: do not try to read total disc/track number if data atom is too short. avconv: fix -force_key_frames dxva2_h264: fix signaling of mbaff frames x86: fft: elf64: fix PIC build Conflicts: ffmpeg.c libavcodec/v210dec.h libavfilter/asrc_anullsrc.c libavfilter/buffersrc.c libavfilter/src_movie.c libavfilter/vf_drawtext.c libavfilter/vf_fade.c libavfilter/vf_overlay.c libavfilter/vsrc_color.c libavfilter/vsrc_testsrc.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * lavfi: remove 'opaque' parameter from AVFilter.init()Anton Khirnov2012-06-2644-60/+57
| | | | | | | | | | | | It is not used in any filters currently and is inherently evil. If passing binary data to filters is required in the future, it should be done with some AVOptions-based system.
| * mov: do not try to read total disc/track number if data atom is too short.Carl Eugen Hoyos2012-06-261-2/+3
| | | | | | | | | | | | Fixes bug 308. Signed-off-by: Anton Khirnov <anton@khirnov.net>
| * avconv: fix -force_key_framesAnton Khirnov2012-06-261-27/+32
| | | | | | | | | | parse_forced_keyframes() relies in encoder timebase being set, so call it from transcode_init() after it is known.
| * dxva2_h264: fix signaling of mbaff framesHendrik Leppkes2012-06-261-1/+2
| | | | | | | | | | | | | | The MBAFF flag may only be signaled if we're actually dealing with a full frame, and not singular fields, as it can happen in mixed content. Signed-off-by: Martin Storsjö <martin@martin.st>
| * x86: fft: elf64: fix PIC buildMans Rullgard2012-06-251-0/+4
| | | | | | | | | | | | | | In a 64-bit PIC build, external functions must be called through the PLT. Signed-off-by: Mans Rullgard <mans@mansr.com>
* | examples/filtering: fix packet memleakGavin Kinsey2012-06-262-2/+2
| | | | | | | | | | | | | | Free packets unconditionally after demuxing, and not only when the packets belong to a given stream. Signed-off-by: Stefano Sabatini <stefasab@gmail.com>
* | examples/filtering_video: update to the new APIGavin Kinsey2012-06-261-9/+25
| | | | | | | | | | | | Update the video filtering example program based on the audio one. Signed-off-by: Stefano Sabatini <stefasab@gmail.com>
* | x86: fft: elf64: fix PIC buildMans Rullgard2012-06-261-0/+4
| | | | | | | | | | | | | | In a 64-bit PIC build, external functions must be called through the PLT. Signed-off-by: Mans Rullgard <mans@mansr.com>
* | Revert "Revert "x86: fft: win64: fix stack alignment for memcpy() call""Nicolas George2012-06-261-7/+9
| | | | | | | | | | | | This reverts commit f767658414fc85dea4006cb82969b6a925fdd380. The bug it introduces has been fixed.
* | Revert "Revert "x86: fft: convert sse inline asm to yasm""Nicolas George2012-06-263-121/+129
| | | | | | | | | | | | This reverts commit fd91a3ec44de38251b2c15e03e26d14e983c4e44. The bug it introduced has been fixed.
* | sink_buffer: make opaque argument optional.Nicolas George2012-06-261-16/+20
| |
* | buffersink: group libav API functions.Nicolas George2012-06-261-2/+11
| |
* | lavu/imgutils: create misc functions for dealing with buffersStefano Sabatini2012-06-267-87/+154
| | | | | | | | | | | | | | | | | | | | | | | | | | Move the lavc/imgconvert functions and rename them as follows: avpicture_get_size -> av_image_get_buffer_size() avpicture_fill -> av_image_fill_arrays() avpicture_layout -> av_image_copy_to_buffer() The new functions have an align parameter, which allows to define the linesize alignment assumed in the buffer (which is set or read). The names of the functions are consistent with the lavu/samples API (av_samples_get_buffer_size(), av_samples_fill_arrays()).
* | Revert "x86: fft: convert sse inline asm to yasm"Nicolas George2012-06-263-129/+121
| | | | | | | | | | | | This reverts commit 82992604706144910f4a2f875d48cfc66c1b70d7. It breaks shared builds on x86_64.
* | Revert "x86: fft: win64: fix stack alignment for memcpy() call"Nicolas George2012-06-261-9/+7
| | | | | | | | | | | | This reverts commit 8725da49a2090de05b4b2d05e33727f45cb9d970. Necerrary to revert 82992604706144910f4a2f875d48cfc66c1b70d7.
* | ffplay: add configure_filtergraph() helperStefano Sabatini2012-06-261-23/+39
| | | | | | | | | | Will help factorization with the pending -af patch, and add some checks missing in the original code.
* | lavfi: drop deprecated and disabled packing APIStefano Sabatini2012-06-265-58/+0
| | | | | | | | It was deprecated and removed after the recent 2->3 major bump.
* | lavfi: remove old video sink APIStefano Sabatini2012-06-265-38/+2
| | | | | | | | | | It was deprecated since a long time and removed after the 2->3 major bump.
* | tools/graph2dot: make dot graph representation a bit more compactStefano Sabatini2012-06-261-6/+6
| |
* | Make LucasArts Smush SANM palette opaque.Carl Eugen Hoyos2012-06-261-4/+4
| | | | | | | | Reviewed-by: Paul B Mahol
* | Signal MSS1 palette change.Carl Eugen Hoyos2012-06-261-1/+1
| | | | | | | | Reviewed-by: Paul B Mahol
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-06-264-49/+50
|\| | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: log: Include io.h on windows lavr: x86: merge some branches x86: cpu: whitespace (mostly) cosmetics x86: fft: win64: fix stack alignment for memcpy() call Conflicts: libavutil/log.c Merged-by: Michael Niedermayer <michaelni@gmx.at>