summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* gitignore: add examples/transcodingLukasz Marek2014-07-101-0/+1
| | | | | Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* configure: add new dependencies for spp & mpdecimateMichael Niedermayer2014-07-101-2/+2
| | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* Merge commit 'f46bb608d9d76c543e4929dc8cffe36b84bd789e'Michael Niedermayer2014-07-1030-426/+667
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'f46bb608d9d76c543e4929dc8cffe36b84bd789e': dsputil: Split off pixel block routines into their own context Conflicts: configure libavcodec/dsputil.c libavcodec/mpegvideo_enc.c libavcodec/pixblockdsp_template.c libavcodec/x86/dsputilenc.asm libavcodec/x86/dsputilenc_mmx.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * dsputil: Split off pixel block routines into their own contextDiego Biurrun2014-07-0926-386/+621
| |
* | avformat/hlsenc: correctly compute target durationNicolas Martyanoff2014-07-101-1/+1
| | | | | | | | | | | | | | | | | | | | With HLS, the duration of all segments must be lower or equal to the target duration. Therefore floor(duration + 0.5) yields incorrect results. For example, for duration = 1.35, floor(duration + 0.5) yields 1.0, but the correct result is 2.0. Signed-off-by: Anssi Hannula <anssi.hannula@iki.fi>
* | avcodec/hevc_sei: factor return 1 out of if/else chainMichael Niedermayer2014-07-101-6/+1
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit '0569a7e0bd2006d9a5248d17a1f4bf3ca654ae50'Michael Niedermayer2014-07-103-0/+38
|\ \ | |/ | | | | | | | | | | | | | | | | | | * commit '0569a7e0bd2006d9a5248d17a1f4bf3ca654ae50': hevc: parse display orientation SEI message Conflicts: libavcodec/hevc.h libavcodec/hevc_sei.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * hevc: parse display orientation SEI messageVittorio Giovara2014-07-093-0/+37
| | | | | | | | Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
* | Merge commit '18e3d61e9e3b52c177aa7a1f2a054a8a753e1b09'Michael Niedermayer2014-07-103-0/+45
|\ \ | |/ | | | | | | | | | | | | | | | | * commit '18e3d61e9e3b52c177aa7a1f2a054a8a753e1b09': h264: parse display orientation SEI message Conflicts: libavcodec/h264.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * h264: parse display orientation SEI messageVittorio Giovara2014-07-093-0/+45
| | | | | | | | Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
* | Merge commit 'a54f03bf07da964a1b04b03b85bc39deba76efa4'Michael Niedermayer2014-07-094-1/+23
|\ \ | |/ | | | | | | | | | | | | | | | | * commit 'a54f03bf07da964a1b04b03b85bc39deba76efa4': display: add matrix flip api Conflicts: libavutil/version.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * display: add matrix flip apiVittorio Giovara2014-07-094-2/+24
| |
* | Merge commit '33a7b453a8e1f090c694ea4f36769dc837be88f0'Michael Niedermayer2014-07-091-0/+11
|\ \ | |/ | | | | | | | | | | * commit '33a7b453a8e1f090c694ea4f36769dc837be88f0': doc: mention option to mix shared/static libraries Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * doc: mention option to mix shared/static librariesAndrew Kelley2014-07-091-0/+11
| | | | | | | | Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
* | Merge commit '0307cc2253e76772b1c645ac6117d08da87a147c'Michael Niedermayer2014-07-098-29/+39
|\ \ | |/ | | | | | | | | | | * commit '0307cc2253e76772b1c645ac6117d08da87a147c': rtpdec: pass an AVFormatContext to ff_parse_fmtp() Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * rtpdec: pass an AVFormatContext to ff_parse_fmtp()Anton Khirnov2014-07-098-29/+39
| | | | | | | | Use it for logging, instead of NULL or the stream codec context.
* | Merge commit '650d384048ed42579cc6d67bf32a94b468c0b6cb'Michael Niedermayer2014-07-091-9/+6
|\ \ | |/ | | | | | | | | | | | | | | | | * commit '650d384048ed42579cc6d67bf32a94b468c0b6cb': yuv4mpegenc: do not access AVCodecContext.coded_frame Conflicts: libavformat/yuv4mpegenc.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * yuv4mpegenc: do not access AVCodecContext.coded_frameAnton Khirnov2014-07-091-3/+5
| | | | | | | | | | | | | | | | Its contents are meaningful only if the stream codec context is the one actually used for encoding, which is often not the case (and is discouraged). Use AVCodecContext.field_order instead.
* | Merge commit '27c1f82f561932c83191bcd3e70e0cb1712485ba'Michael Niedermayer2014-07-091-15/+0
|\ \ | |/ | | | | | | | | | | * commit '27c1f82f561932c83191bcd3e70e0cb1712485ba': nsvdec: remove commented out cruft Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * nsvdec: remove commented out cruftAnton Khirnov2014-07-091-15/+0
| |
* | Merge commit 'edb1af7c466ebb28bfdb0c076e498e527b43d24f'Michael Niedermayer2014-07-091-6/+2
|\ \ | |/ | | | | | | | | | | * commit 'edb1af7c466ebb28bfdb0c076e498e527b43d24f': mov: free the dv demux context with avformat_free_context() Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * mov: free the dv demux context with avformat_free_context()Anton Khirnov2014-07-091-6/+2
| |
* | Merge commit 'a14b61658c3302081ea5da3ea65b7d9f7b4fb2eb'Michael Niedermayer2014-07-091-1/+0
|\ \ | |/ | | | | | | | | | | * commit 'a14b61658c3302081ea5da3ea65b7d9f7b4fb2eb': mtv: do not set sample_rate for video Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * mtv: do not set sample_rate for videoAnton Khirnov2014-07-091-1/+0
| |
* | Merge commit 'b8604a976128ffbd316653cdec11ba487f1025bb'Michael Niedermayer2014-07-091-3/+1
|\ \ | |/ | | | | | | | | | | | | | | | | * commit 'b8604a976128ffbd316653cdec11ba487f1025bb': oggparsecelt: do not set AVCodecContext.frame_size Conflicts: libavformat/oggparsecelt.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * oggparsecelt: do not set AVCodecContext.frame_sizeAnton Khirnov2014-07-091-3/+1
| | | | | | | | It is supposed to be set by decoders only.
* | Merge commit 'd5cf5afabbf43f00283e70b12afbe1da030d85b6'Michael Niedermayer2014-07-095-15/+25
|\ \ | |/ | | | | | | | | | | * commit 'd5cf5afabbf43f00283e70b12afbe1da030d85b6': adxdec: get rid of an avpriv function Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * adxdec: get rid of an avpriv functionAnton Khirnov2014-07-095-15/+25
| | | | | | | | | | The only thing the demuxer needs is the sample rate to set the timebase, which can be simply read with AV_RB32.
* | Merge commit 'f6ee61fb05482c617f5deee29a190d8ff483b3d1'Michael Niedermayer2014-07-0913-61/+128
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'f6ee61fb05482c617f5deee29a190d8ff483b3d1': lavc: export DV profile API used by muxer/demuxer as public Conflicts: configure doc/APIchanges libavcodec/Makefile libavcodec/dv_profile.c libavcodec/dv_profile.h libavcodec/version.h libavformat/dvenc.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * lavc: export DV profile API used by muxer/demuxer as publicAnton Khirnov2014-07-0913-48/+121
| |
* | ffmpeg: remove common factors from copied timebaseMichael Niedermayer2014-07-091-1/+2
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit '3f3232a371cc88696184d9aef1f812656264e56c'Michael Niedermayer2014-07-091-0/+2
|\ \ | |/ | | | | | | | | | | | | | | | | * commit '3f3232a371cc88696184d9aef1f812656264e56c': avconv: set the output stream timebase Conflicts: ffmpeg.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * avconv: set the output stream timebaseAnton Khirnov2014-07-091-0/+2
| | | | | | | | This is required by the new API.
* | Merge commit 'c9c1265c52910578d3db1a6205c85b91ead0903f'Michael Niedermayer2014-07-091-3/+3
|\ \ | |/ | | | | | | | | | | * commit 'c9c1265c52910578d3db1a6205c85b91ead0903f': avformat: update muxing doxy Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * avformat: update muxing doxyAnton Khirnov2014-07-091-3/+3
| | | | | | | | The callers should now set the stream timebase, not the codec one.
* | Merge commit 'abda15a990527557c20848f6ca2f82eb85e76dc9'Michael Niedermayer2014-07-091-0/+11
|\ \ | |/ | | | | | | | | | | * commit 'abda15a990527557c20848f6ca2f82eb85e76dc9': cdg: set the keyframe flag on the first packet Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * cdg: set the keyframe flag on the first packetAnton Khirnov2014-07-091-0/+11
| | | | | | | | Bug-Id: 55
* | avcodec/roqvideoenc: Print the correct max resolutionMichael Niedermayer2014-07-091-1/+1
| | | | | | | | | | Thanks-to: Vitor Sessak <vitor1001@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec/roqvideoenc: More verbose warning about no power of 2 dimensionsMichael Niedermayer2014-07-091-1/+1
| | | | | | | | | | Thanks-to: Vitor Sessak <vitor1001@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec/dvdsubenc: Add dvdsub workaround for some playersOliver Fromme2014-07-091-0/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The issue affects dvdsub subtitles (a.k.a. VOBSUB). Some players -- in particular hardware players -- cut off the lowest row of pixels if the number of rows in the subtitle is odd. The patch below implements a work-around for that. If the number of rows is odd, it is simply rounded up to an even number, adding an invisible (i.e. fully transparent) row. The work-around can be enabled or disabled with a new option -even_rows_fix. The default is disabled, so there is no change of behaviour for users who don't care about it. The overhead for the fix is low, and in many cases even zero: For subtitles with an odd number of rows (i.e. in 50% of cases on average), the size increases by two bytes because a fully transparent row is encoded as 0x00 0x00. However, in the VOBSUB standard, all data packets are padded to 2KB anyway, so in most cases the additional bytes just use some part of the padding, so there is no overhead. Only in the rare case that the 2KB boundary is hit (0.1% chance), a full 2KB block is added. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec/pthread_frame: fix setting hwaccel with threads and get_format()Michael Niedermayer2014-07-091-1/+1
| | | | | | | | | | | | | | | | Fixes assertion failure with vdpau and vlc Fixes Ticket3742 Tested-by: oromit Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avutil/bprint:ædd io.h, try to fix msvc buildMichael Niedermayer2014-07-091-0/+3
| | | | | | | | | | Suggested-by: jamrial Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/m4vdec: raise threshold slightly for detectionMichael Niedermayer2014-07-091-1/+1
| | | | | | | | | | | | Fixes Ticket3746 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec/mpegvideo: clip mv visualization arrows so that their direction is ↵Michael Niedermayer2014-07-091-0/+28
| | | | | | | | | | | | maintained Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Fix wmv1 encoding if all other msmpeg4-related encoders were disabled.Carl Eugen Hoyos2014-07-092-0/+2
| |
* | Fix wmv1 decoding if no other msmpeg4-related decoder was compiled.Carl Eugen Hoyos2014-07-091-0/+1
| |
* | avcodec/mpegvideo: flip motion vector visualization for backward motion vectorsMichael Niedermayer2014-07-091-5/+15
| | | | | | | | | | | | Also support changing arrow head/tail shape Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avdevice/pulse_audio_dec: reimplement using the non simple APIMichael Niedermayer2014-07-092-54/+235
| | | | | | | | | | | | | | | | This fixes timestamps Based-on: code from pulseaudio Reviewed-by: Lukasz Marek <lukasz.m.luki2@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/movenc: respect color_range when encoding dnxhd.Mark Boorer2014-07-091-1/+5
| | | | | | | | | | | | Set the ACLR atom appropriately for legal / full range. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/segment: remove gettimeofday() use, remove sys/time.hMichael Niedermayer2014-07-081-6/+6
| | | | | | | | | | | | | | It causes portability issues, and would need ifdef hell if its kept Found-by: jamrial Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
OpenPOWER on IntegriCloud