summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* lavf: add audio_preload option, this allows interleaving audio earlierMichael Niedermayer2011-12-014-1/+19
| | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* ffmpeg: factorize duration calculation in transcode_video()Michael Niedermayer2011-12-011-14/+11
| | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* ffmpeg: make copy_tb tri state so the user can select either timebase orMichael Niedermayer2011-12-011-6/+8
| | | | | | | leave it at auto Inspired-by a change from Anton Khirnov Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* Merge remote-tracking branch 'qatar/master'Michael Niedermayer2011-12-01146-468/+570
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: rtpdec: Templatize the code for different g726 bitrate variants rv40: move loop filter to rv34dsp context lavf: make av_set_pts_info private. rtpdec: Add support for G726 audio rtpdec: Add an init function that can do custom codec context initialization avconv: make copy_tb on by default. matroskadec: don't set codec timebase. rmdec: don't set codec timebase. avconv: compute next_pts from input packet duration when possible. lavf: estimate frame duration from r_frame_rate. avconv: update InputStream.pts in the streamcopy case. Conflicts: avconv.c libavdevice/alsa-audio-dec.c libavdevice/bktr.c libavdevice/fbdev.c libavdevice/libdc1394.c libavdevice/oss_audio.c libavdevice/v4l.c libavdevice/v4l2.c libavdevice/vfwcap.c libavdevice/x11grab.c libavformat/au.c libavformat/eacdata.c libavformat/flvdec.c libavformat/mpegts.c libavformat/mxfenc.c libavformat/rtpdec_g726.c libavformat/wtv.c libavformat/xmv.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * rtpdec: Templatize the code for different g726 bitrate variantsMartin Storsjö2011-11-301-77/+23
| | | | | | | | Signed-off-by: Martin Storsjö <martin@martin.st>
| * rv40: move loop filter to rv34dsp contextJanne Grunau2011-11-304-164/+176
| | | | | | | | Signed-off-by: Mans Rullgard <mans@mansr.com>
| * lavf: make av_set_pts_info private.Anton Khirnov2011-11-30139-205/+338
| | | | | | | | It's supposed to be called only from (de)muxers.
| * rtpdec: Add support for G726 audioMiroslav Slugeň2011-11-304-0/+112
| | | | | | | | | | | | | | | | | | | | | | This requires using a separate init function, since there isn't necessarily any fmtp lines for this codec, so parse_sdp_a_line won't be called. Incorporating it with the alloc function wouldn't do either, since it is called before the full rtpmap line is parsed (where the sample rate is extracted). Signed-off-by: Martin Storsjö <martin@martin.st>
| * rtpdec: Add an init function that can do custom codec context initializationMartin Storsjö2011-11-302-0/+7
| | | | | | | | Signed-off-by: Martin Storsjö <martin@martin.st>
| * avconv: make copy_tb on by default.Anton Khirnov2011-11-301-4/+2
| | | | | | | | | | | | | | I.e. on streamcopy set output codec timebase from input stream timebase (as opposed to input codec timebase). This should be more sane, because since the stream is not decoded, the input codec tb has no relation to the timestamps of the copied packets.
| * matroskadec: don't set codec timebase.Anton Khirnov2011-11-301-4/+0
| | | | | | | | It's not supposed to be set outside of lavc.
| * rmdec: don't set codec timebase.Anton Khirnov2011-11-301-3/+2
| | | | | | | | | | It's not supposed to be set outside of lavc. Set r_frame_rate instead.
| * avconv: compute next_pts from input packet duration when possible.Anton Khirnov2011-11-301-1/+3
| |
| * lavf: estimate frame duration from r_frame_rate.Anton Khirnov2011-11-301-1/+4
| | | | | | | | | | If r_frame_rate is set, it should be more reliable for this than either codec or stream timebase.
| * avconv: update InputStream.pts in the streamcopy case.Anton Khirnov2011-11-301-0/+1
| | | | | | | | This was broken in 2a651b719c309c5e2fc663a5a9d6ca36153ab98f.
* | BPP fix, YUVP9, 10, 16 support, make RGB24 defaultMichael Bradshaw2011-11-301-21/+81
| |
* | Use correct context for av_log.Carl Eugen Hoyos2011-12-011-1/+1
| | | | | | | | Fixes ticket #695.
* | movenc: replace cluster memset by zeroing only the needed field.Michael Niedermayer2011-11-301-1/+1
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | lavc: Fix side data handling for audio decoders.Michael Niedermayer2011-11-301-2/+2
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | nellymoserdec: Use sidedata to support mid stream sample rate changes.Michael Niedermayer2011-11-301-0/+3
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | flvdemux: export flags for nellymoser through side data.Michael Niedermayer2011-11-301-0/+2
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avfilter: align allocated images to 32 for AVX and IFFMichael Niedermayer2011-11-301-1/+1
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | lavc: horizontal align for IFFMichael Niedermayer2011-11-301-0/+4
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | ac3probe: Change threshold from 500 to 200 to keep in sync with mp3.Michael Niedermayer2011-11-301-1/+1
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | mp3probe: Detect mp3 stronger with just 200 frames, this should speed up ↵Michael Niedermayer2011-11-301-1/+1
| | | | | | | | | | | | | | | | detection on mp3 streams. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | wmall: fix return type of dump_int_buffer()Michael Niedermayer2011-11-301-1/+1
| | | | | | | | | | Found-by: Dominique Leuenberger Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | movenc: memset(0) new cluster elements after realloc()Michael Niedermayer2011-11-301-0/+1
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | wmall: remove tabs that leaked in from a merge and seem to haveMichael Niedermayer2011-11-301-143/+143
| | | | | | | | | | | | managed to silently bypass the push checks. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Fix typeo in some rarely used memoizationJoseph Wecker2011-11-301-1/+1
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | removes spurious warningJoseph Wecker2011-11-301-1/+1
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2011-11-303-32/+33
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | * qatar/master: indeo3: check per-plane data buffer against input buffer bounds. avconv: Handle audio sync for non-S16 sample formats. pthread: don't increment index on zero-sized packets. Conflicts: libavcodec/indeo3.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * indeo3: check per-plane data buffer against input buffer bounds.Aneesh Dogra2011-11-291-1/+3
| | | | | | | | | | | | Fixes : http://bugzilla.libav.org/show_bug.cgi?id=102 Signed-off-by: Alex Converse <alex.converse@gmail.com>
| * avconv: Handle audio sync for non-S16 sample formats.Alex Converse2011-11-281-15/+16
| | | | | | | | Also fix reporting of the number of samples added/dropped.
| * pthread: don't increment index on zero-sized packets.Aaron Colwell2011-11-281-2/+1
| | | | | | | | | | | | | | | | The next call to decode() will update from an invalid index, which will either lead to a memcpy() where dest==src (2 threads), or lead to a crash (>2 threads). Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
* | ffmpeg.c use b:v for video bitrates using a targetJean First2011-11-301-3/+3
| | | | | | | | | | | | it's more consistent to use -b:v instead of just -b Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | ffmpeg: do not use a negative total_size (AVERROR) in bitrate estimation.Clément Bœsch2011-11-291-1/+4
| |
* | Consistently use %ifdef ARCH_X86_64Reimar Döffinger2011-11-291-3/+3
| | | | | | | | | | | | One out of 3 places used ifndef, which is needlessly confusing. Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
* | docs: Spelling fixes to 9 texi files from /docroot2011-11-299-35/+35
| | | | | | | | | | | | | | credits to: Violet Lin (from Google Code-in) Signed-off-by: burek <burek021@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | faq.texi: fix spelling errorsroot2011-11-291-5/+5
| | | | | | | | | | | | credits to: Philip (from Google Code-in) Signed-off-by: burek <burek021@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | developer.texi: fix spelling errorsroot2011-11-291-7/+7
| | | | | | | | | | | | credits to: KayC (from Google Code-in) Signed-off-by: burek <burek021@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | general.texi: fix spelling errorsroot2011-11-291-4/+4
| | | | | | | | | | | | credits to: Samuel M (from Google Code-in) Signed-off-by: burek <burek021@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | lavc: dont call set_dimensions() on h264 codec init.Michael Niedermayer2011-11-291-0/+3
| | | | | | | | | | | | | | | | This fixes ffprobe showing an incorrect width with http://panda-test-harness-videos.s3.amazonaws.com/panda.mp4 Idea-by: Joakim Plate <elupus@ecce.se> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | swr: handle correctly muted channel with u8 sample fmt.Clément Bœsch2011-11-291-3/+5
| |
* | movenc: Remove unneeded chunkSize field from MOVIentryGeek.Song2011-11-292-4/+4
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avutil: revert project name messingMichael Niedermayer2011-11-292-4/+4
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | ac3enc: clenaup project name in one commentMichael Niedermayer2011-11-291-1/+1
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | movenc: Write file with minimal number of chunks for the given interleaving.Michael Niedermayer2011-11-2917-40/+66
| | | | | | | | | | Reviewed-by: Baptiste Coudurier <baptiste.coudurier@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2011-11-2926-47/+34
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: adtsenc: Check frame size. txd: Fix order of operations. APIchanges: fill in some blanks timer: fix misspelling of "decicycles" Eliminate pointless 0/NULL initializers in AVCodec and similar declarations. indeo3: cosmetics md5proto: Fix order of operations. dca: Replace oversized unused get_bits() with skip_bits_long(). Conflicts: doc/APIchanges libavformat/mmsh.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * adtsenc: Check frame size.Alex Converse2011-11-282-4/+21
| | | | | | | | | | | | Inspired by work from: Michael Niedermayer <michaelni@gmx.at>. Signed-off-by: Alex Converse <alex.converse@gmail.com>
| * txd: Fix order of operations.Alex Converse2011-11-281-1/+2
| |
View Lorry Controller Status