aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-08-1824-153/+298
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: mpegvideo_enc: don't use deprecated avcodec_encode_video(). cmdutils: refactor -codecs option. avconv: make -shortest a per-output file option. lavc: add avcodec_descriptor_get_by_name(). lavc: add const to AVCodec* function parameters. swf(dec): replace CODEC_ID with AV_CODEC_ID dvenc: don't use deprecated AVCODEC_MAX_AUDIO_FRAME_SIZE rtmpdh: Do not generate the same private key every time when using libnettle rtp: remove ff_rtp_get_rtcp_file_handle(). rtsp.c: use ffurl_get_multi_file_handle() instead of ff_rtp_get_rtcp_file_handle() avio: add (ff)url_get_multi_file_handle() for getting more than one fd h264: vdpau: fix crash with unsupported colorspace amrwbdec: Decode the fr_quality bit properly Conflicts: Changelog cmdutils.c cmdutils_common_opts.h doc/ffmpeg.texi ffmpeg.c ffmpeg.h ffmpeg_opt.c libavcodec/h264.c libavcodec/options.c libavcodec/utils.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * mpegvideo_enc: don't use deprecated avcodec_encode_video().Anton Khirnov2012-08-181-8/+23
| |
| * cmdutils: refactor -codecs option.Anton Khirnov2012-08-184-82/+131
| | | | | | | | | | | | | | Make it print a list of AVCodecDescriptors. Add new -decoders and -encoders options that print lists of decoders and encoders respectively.
| * avconv: make -shortest a per-output file option.Anton Khirnov2012-08-185-10/+15
| |
| * lavc: add avcodec_descriptor_get_by_name().Anton Khirnov2012-08-182-0/+19
| |
| * lavc: add const to AVCodec* function parameters.Anton Khirnov2012-08-183-14/+17
| |
| * swf(dec): replace CODEC_ID with AV_CODEC_IDAnton Khirnov2012-08-182-9/+9
| |
| * dvenc: don't use deprecated AVCODEC_MAX_AUDIO_FRAME_SIZEAnton Khirnov2012-08-181-2/+4
| |
| * rtmpdh: Do not generate the same private key every time when using libnettleSamuel Pitoiset2012-08-171-1/+9
| | | | | | | | | | | | | | Replace mpz_random by mpz_urandomb with a random state initialization in order to improve the randomness. Signed-off-by: Martin Storsjö <martin@martin.st>
| * rtp: remove ff_rtp_get_rtcp_file_handle().Jordi Ortiz2012-08-172-10/+0
| | | | | | | | Signed-off-by: Martin Storsjö <martin@martin.st>
| * rtsp.c: use ffurl_get_multi_file_handle() instead of ↵Jordi Ortiz2012-08-171-4/+16
| | | | | | | | | | | | ff_rtp_get_rtcp_file_handle() Signed-off-by: Martin Storsjö <martin@martin.st>
| * avio: add (ff)url_get_multi_file_handle() for getting more than one fdJordi Ortiz2012-08-173-8/+46
| | | | | | | | Signed-off-by: Martin Storsjö <martin@martin.st>
| * h264: vdpau: fix crash with unsupported colorspaceUoti Urpala2012-08-171-0/+9
| | | | | | | | | | | | | | | | The h264_vdpau decoder crashed if output colorspace was not 8-bit 420. Add a check to error out instead (current hardware does not support other colorspaces, so successful decoding is not possible). Signed-off-by: Martin Storsjö <martin@martin.st>
| * amrwbdec: Decode the fr_quality bit properlyMartin Storsjö2012-08-171-1/+1
| | | | | | | | | | | | | | | | The way this bit is decoded was accidentally flipped in b70feb405, leading to warnings "Encountered a bad or corrupted frame" for each decoded frame. Signed-off-by: Martin Storsjö <martin@martin.st>
* | doc/muxers: simplify segment examplesStefano Sabatini2012-08-181-2/+2
| | | | | | | | The simplifications are due to the recent option changes.
* | lavf/segment: change default value for segment_list_size option, from 5 to 0Stefano Sabatini2012-08-183-3/+3
| | | | | | | | | | This is technically a major compatibility break, but seems the most natural default and what users would expect without reading the docs.
* | lavf/segment: guess list type from list filename suffixStefano Sabatini2012-08-183-6/+17
| |
* | lavfi/mp: remove framestep wrapped filterStefano Sabatini2012-08-185-210/+1
| | | | | | | | An equivalent framestep filter has been natively integrated.
* | lavfi: add framestep filterStefano Sabatini2012-08-186-2/+154
| | | | | | | | | | | | | | | | This filter is inspired upon libmpcodecs/vf_framestep.c, by Daniele Forghieri. Only-keyframe output is not supported, since that feature can be achieved through the more versatile select filter.
* | lavfi/testsrc: set output framerateStefano Sabatini2012-08-182-13/+13
| |
* | lavf/segment: add M3U8 list supportStefano Sabatini2012-08-183-1/+25
| | | | | | | | Address trac ticket #1642.
* | lavf/segment: compute max list segment durationStefano Sabatini2012-08-181-2/+10
| | | | | | | | This is useful for the M3U8 format incoming patch.
* | lavf/segment: create segment_list_open and close functionsStefano Sabatini2012-08-181-7/+18
| | | | | | | | | | Allow factorization for the incoming patches, and avoid code/logic duplication.
* | lavf/segment: fix bogus segment index rewrapping logicStefano Sabatini2012-08-181-11/+15
| | | | | | | | | | Decouple segment index wrapping and segment count logic. The counter should not be reset since it detects the segment increasing timeframe.
* | lavf/segment: move file description to @file doxyStefano Sabatini2012-08-181-1/+4
| |
* | lavf/avio: flush internal buffer when calling avio_close()Stefano Sabatini2012-08-183-1/+5
| | | | | | | | This seems the expected behavior.
* | lavf/avio.h: doxygen avio_flush()Stefano Sabatini2012-08-181-1/+6
| |
* | ffmpeg,ffplay: show filter optionsStefano Sabatini2012-08-182-0/+3
| | | | | | | | Address trac ticket #1599.
* | lavfi: add priv class to filter definitions and flags to filter internal optionsStefano Sabatini2012-08-1830-224/+291
| | | | | | | | | | This allows the iteration callbacks to discover the internal class and options, and show them when required.
* | lavfi/movie: split class definitions for movie and amovieStefano Sabatini2012-08-181-5/+18
| | | | | | | | | | This is required for iterating through the filter class (without incurring into a loop).
* | lavfi/lut: duplicate class definitions for each lut variant filterStefano Sabatini2012-08-181-26/+73
| | | | | | | | | | | | This is due to the design of components iteration through AVClass child_class_next() callback, which requires that two components cannot share the same class.
* | doc/Makefile: add doc target, as an alias for "documentation"Stefano Sabatini2012-08-181-2/+4
| | | | | | | | Consistent with --enable-doc, and easier to type.
* | lavc/tscc: use reget_buffer.Nicolas George2012-08-181-4/+1
| | | | | | | | | | The previous code would release the buffer and get it immediately after, assuming the contents is the same.
* | ffmenc: switch to av_assertMichael Niedermayer2012-08-181-3/+1
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | acelp_filters: switch to avassertMichael Niedermayer2012-08-181-1/+2
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | libvpxenc: Fix CQ encoding without a specified bitrateMichael Niedermayer2012-08-171-2/+15
| | | | | | | | | | | | | | | | | | Also print a warning if neither quality nor bitrate is specified and use the libvpx default bitrate in this case. The idea of using the default bitrate is from Luca Barbato Reviewed-by: James Zern <jzern@google.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | libvpxenc: only force CBR if a bitrate is setMichael Niedermayer2012-08-171-1/+1
| | | | | | | | | | Reviewed-by: James Zern <jzern@google.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | mips: change list of files with MIPS copyright notice in mips.txtNedeljko Babic2012-08-171-0/+4
| | | | | | | | | | | | | | | | Add files created for MP3 optimization that have MIPS copyright notice in them to list of files in mips.txt. Signed-off-by: Nedeljko Babic <nbabic@mips.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | mips: add assembler flags for mips32r2 ISA and mhard-floatNedeljko Babic2012-08-171-2/+2
| | | | | | | | | | | | | | | | | | | | | | For some compilers ISA older than mips32r2 is set as default. Because of them assembler flag "-mips32r2" needs to be added for CPUs that support mips32r2 ISA in part of configure script where ISA capabilities are checked. "-mhard-float" assembler flag is also added for CPUs that have FPU. Signed-off-by: Nedeljko Babic <nbabic@mips.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | vf_yadif: fix permissions.Nicolas George2012-08-171-4/+4
| | | | | | | | | | Require AV_PERM_PRESERVE and leave harmless permissions alone for the next filter.
* | vf_tinterlace: leave harmless permissions alone.Nicolas George2012-08-171-1/+1
| |
* | vf_thumbnail: fix permissions.Nicolas George2012-08-171-1/+1
| |
* | vf_select: require AV_PERM_PRESERVE.Nicolas George2012-08-171-0/+1
| | | | | | | | | | This is only necessary because of the poll_frame implementation. Removing it altogether would be another solution.
* | vf_removelogo: fix permissions.Nicolas George2012-08-171-10/+2
| | | | | | | | The branch with the test was already impossible.
* | vf_overlay: fix permissions.Nicolas George2012-08-171-4/+3
| |
* | vf_idet: fix permissions.Nicolas George2012-08-171-3/+4
| | | | | | | | Only write needs to be removed, other can be left.
* | vf_fps: fix permissions.Nicolas George2012-08-171-1/+3
| |
* | vf_fieldorder: fix permissions.Nicolas George2012-08-171-2/+1
| |
* | vf_fade: fix permissions.Nicolas George2012-08-171-2/+1
| |
* | vf_drawtext: fix permissions.Nicolas George2012-08-171-2/+1
| |