aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-02-2134-382/+485
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: (36 commits) adpcmenc: Use correct frame_size for Yamaha ADPCM. avcodec: add ff_samples_to_time_base() convenience function to internal.h adx parser: set duration mlp parser: set duration instead of frame_size gsm parser: set duration mpegaudio parser: set duration instead of frame_size (e)ac3 parser: set duration instead of frame_size flac parser: set duration instead of frame_size avcodec: add duration field to AVCodecParserContext avutil: add av_rescale_q_rnd() to allow different rounding pnmdec: remove useless .pix_fmts libmp3lame: support float and s32 sample formats libmp3lame: renaming, rearrangement, alignment, and comments libmp3lame: use the LAME default bit rate libmp3lame: use avpriv_mpegaudio_decode_header() for output frame parsing libmp3lame: cosmetics: remove some pointless comments libmp3lame: convert some debugging code to av_dlog() libmp3lame: remove outdated comment. libmp3lame: do not set coded_frame->key_frame. libmp3lame: improve error handling in MP3lame_encode_init() ... Conflicts: doc/APIchanges libavcodec/libmp3lame.c libavcodec/pcxenc.c libavcodec/pnmdec.c libavcodec/pnmenc.c libavcodec/sgienc.c libavcodec/utils.c libavformat/hls.c libavutil/avutil.h libswscale/x86/swscale_mmx.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * adpcmenc: Use correct frame_size for Yamaha ADPCM.Justin Ruggles2012-02-202-5/+5
| | | | | | | | | | | | | | | | | | | | | | Output packet size should match avctx->block_align. The target output packet size is 1024 bytes. Before: mono - 1024 samples -> 512 bytes stereo - 2048 samples -> 2048 bytes After: mono - 2048 samples -> 1024 bytes stereo - 1024 samples -> 1024 bytes
| * avcodec: add ff_samples_to_time_base() convenience function to internal.hJustin Ruggles2012-02-204-15/+21
| |
| * adx parser: set durationJustin Ruggles2012-02-201-0/+3
| |
| * mlp parser: set duration instead of frame_sizeJustin Ruggles2012-02-201-1/+1
| |
| * gsm parser: set durationJustin Ruggles2012-02-201-2/+12
| |
| * mpegaudio parser: set duration instead of frame_sizeJustin Ruggles2012-02-201-1/+1
| |
| * (e)ac3 parser: set duration instead of frame_sizeJustin Ruggles2012-02-201-1/+1
| |
| * flac parser: set duration instead of frame_sizeJustin Ruggles2012-02-201-4/+6
| |
| * avcodec: add duration field to AVCodecParserContextJustin Ruggles2012-02-203-0/+24
| | | | | | | | | | This will allow parsers to export the duration of the current frame being output, if known, instead of using AVCodecContext.frame_size.
| * avutil: add av_rescale_q_rnd() to allow different roundingJustin Ruggles2012-02-204-3/+19
| |
| * pnmdec: remove useless .pix_fmtsPaul B Mahol2012-02-201-5/+0
| | | | | | | | | | Signed-off-by: Paul B Mahol <onemda@gmail.com> Signed-off-by: Justin Ruggles <justin.ruggles@gmail.com>
| * libmp3lame: support float and s32 sample formatsJustin Ruggles2012-02-201-11/+84
| |
| * libmp3lame: renaming, rearrangement, alignment, and commentsJustin Ruggles2012-02-201-35/+51
| |
| * libmp3lame: use the LAME default bit rateJustin Ruggles2012-02-201-2/+10
| | | | | | | | Also, only set bit rate for CBR.
| * libmp3lame: use avpriv_mpegaudio_decode_header() for output frame parsingJustin Ruggles2012-02-202-57/+8
| |
| * libmp3lame: cosmetics: remove some pointless commentsJustin Ruggles2012-02-201-2/+0
| |
| * libmp3lame: convert some debugging code to av_dlog()Justin Ruggles2012-02-201-5/+2
| | | | | | | | also remove unneeded commented-out full frame data debugging
| * libmp3lame: remove outdated comment.Justin Ruggles2012-02-201-2/+0
| | | | | | | | | | | | We now require at least libmp3lame 3.98.3. lame_encode_buffer_interleaved() still doesn't work for mono, but it does not "die"; it just expects a stereo interleaved buffer.
| * libmp3lame: do not set coded_frame->key_frame.Justin Ruggles2012-02-201-1/+0
| | | | | | | | it is already set in avcodec_alloc_frame()
| * libmp3lame: improve error handling in MP3lame_encode_init()Justin Ruggles2012-02-201-19/+25
| |
| * libmp3lame: remove unneeded 'stereo' field from Mp3AudioContextJustin Ruggles2012-02-201-5/+2
| |
| * hls: Reset the AVIOContext when seekingMartin Storsjö2012-02-201-0/+4
| | | | | | | | | | | | | | | | This avoids reading any old data in the AVIOContext buffer after the seek, and indicates to the mpegts demuxer that we've seeked, avoiding continuity check errors. Signed-off-by: Martin Storsjö <martin@martin.st>
| * pcxenc: switch to encode2().Anton Khirnov2012-02-201-9/+22
| |
| * sgienc: switch to encode2().Anton Khirnov2012-02-201-14/+25
| |
| * targaenc: switch to encode2().Anton Khirnov2012-02-201-26/+30
| |
| * targaenc: don't modify input frame.Anton Khirnov2012-02-201-3/+1
| | | | | | | | Set the pict_type/key_frame properties on the coded picture.
| * roqvideoenc: switch to encode2().Anton Khirnov2012-02-201-9/+16
| |
| * roqvideoenc: add const qualifier to the input frame.Anton Khirnov2012-02-202-9/+9
| |
| * pnmenc: switch to encode2().Anton Khirnov2012-02-201-13/+19
| |
| * huffyuv: switch to encode2().Anton Khirnov2012-02-201-9/+20
| |
| * v410enc: switch to encode2().Anton Khirnov2012-02-201-12/+13
| |
| * zmbvenc: switch to encode2().Anton Khirnov2012-02-201-15/+26
| |
| * zmbvenc: move header writing to the end of encode_frame().Anton Khirnov2012-02-201-11/+13
| | | | | | | | | | | | This makes switching to encode2() simpler, because it allows us to know exactly how large should the output buffer be before we start writing into it.
| * h264: don't use redzone in loopfilter on win64.Ronald S. Bultje2012-02-191-1/+8
| | | | | | | | Red zone usage is not allowed in the Win64 ABI.
| * Revert two swscale commits.Ronald S. Bultje2012-02-193-6/+22
| | | | | | | | | | | | | | | | | | | | | | Revert "swscale: update context offsets after removal of AlpMmxFilter." (commit a95e3fa90b4190381b65d180eec5a4027075e2da) and Revert "swscale: Remove some write-only variables related to alpha handling." (commit 9d03cb9fc5ddf914920ab0dbe13f19a34c754966). They broke alpha handling - it's the evil inline asm that still uses that variable, so it's not truely write-only.
| * applehttp: Do seeking within segments, tooPanagiotis H.M. Issaris2012-02-191-8/+47
| | | | | | | | | | | | | | | | | | | | | | Enhance seeking by demuxing until the requested timestamp is reached within the segment selected by the seek code using the playlist info. Some mpegts streams don't have dts set for all packets though, this seeking method doesn't work well for that case. Signed-off-by: Martin Storsjö <martin@martin.st>
* | af_pan: move query_format before config_props.Nicolas George2012-02-201-23/+23
| | | | | | | | | | That is the logical order in which the functions are called, and there is no longer any need of forward declarations.
* | af_pan: remove the indirect function call.Nicolas George2012-02-201-16/+1
| | | | | | | | libswresample is used in all cases.
* | Add missing av_free_packet.Reimar Döffinger2012-02-201-0/+1
| | | | | | | | | | | | | | Fixes memory leak when encoding at least with mpegvideo using the new encode2 function. Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
* | af_pan: reindent after last commit.Nicolas George2012-02-201-23/+21
| |
* | af_pan: use libswr for rematrixing.Nicolas George2012-02-202-50/+24
| |
* | libswr: allow to set custom matrices.Nicolas George2012-02-205-11/+60
| |
* | matroskadec: remove H.264 special-case that disabled header parsing.Reimar Döffinger2012-02-201-1/+0
| | | | | | | | | | | | | | | | | | The parser was fixed so this workaround should no longer be necessary. This allows using stream-copy to fix files with keyframes incorrectly marked. Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
* | ffprobe: report bit rate in stream descriptionMatthieu Bouron2012-02-202-0/+3
| | | | | | | | Signed-off-by: Stefano Sabatini <stefasab@gmail.com>
* | lavc: set bit_rate in the decoder context, just after the init stageStefano Sabatini2012-02-202-24/+27
| | | | | | | | | | Also move the get_bit_rate() function, in order to avoid an undefined symbol reference in avcodec_open2().
* | doc: fix channel layout value in abuffer example.Clément Bœsch2012-02-201-2/+2
| | | | | | | | | | The channel layout must start with 0x, otherwise it is parsed as a number of channels.
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-02-2016-46/+75
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: doxy: remove reference to removed api examples: unbreak compilation ttadec: cosmetics: reindent sunrast: use RLE trigger macro inplace of the hard coded value. sunrastenc: set keyframe flag for the output packet. mpegvideo_enc: switch to encode2(). mpegvideo_enc: force encoding delay of at least 1 frame when low_delay=0 Conflicts: doc/examples/muxing.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * doxy: remove reference to removed apiLuca Barbato2012-02-191-4/+3
| |
| * examples: unbreak compilationLuca Barbato2012-02-192-19/+9
| | | | | | | | Update api so it will compile again.