virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-11-26 19:01:44 +02:00
Code Issues Releases Activity
35,328 Commits 37 Branches 400 Tags 460 MiB
43a2a8b4a3
Commit Graph

35328 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Peter Ross
43a2a8b4a3 pictordec: use correct context for another av_log 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-12-01 14:34:46 +01:00
Michael Niedermayer
67eb95ce15 ffmpeg: fix segfault with ffmpeg -h 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-12-01 04:32:27 +01:00
Michael Niedermayer
03b60509cb ffmpeg: fix changing sample rate handling 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-12-01 04:06:59 +01:00
Michael Niedermayer
ec20fc1581 lavf: allow grouping packets in chunks of a user specified size and duration. 
This is similar to MP4Boxs -inter

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-12-01 03:53:13 +01:00
Michael Niedermayer
31f9032b78 lavf: add audio_preload option, this allows interleaving audio earlier 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-12-01 03:53:07 +01:00
Michael Niedermayer
54e40b9c14 ffmpeg: factorize duration calculation in transcode_video() 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-12-01 03:49:38 +01:00
Michael Niedermayer
6e96ad8215 ffmpeg: make copy_tb tri state so the user can select either timebase or 
leave it at auto

Inspired-by a change from Anton Khirnov
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-12-01 03:49:37 +01:00
Michael Niedermayer
9d76cf0b18 Merge remote-tracking branch 'qatar/master' 
* 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>
 2011-12-01 02:54:24 +01:00
Michael Bradshaw
0275b75a7e BPP fix, YUVP9, 10, 16 support, make RGB24 default 2011-11-30 16:48:03 -07:00
Carl Eugen Hoyos
9dcd8b86f9 Use correct context for av_log. 
Fixes ticket #695.
 2011-12-01 00:28:46 +01:00
Michael Niedermayer
c863d3751f movenc: replace cluster memset by zeroing only the needed field. 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-11-30 23:11:49 +01:00
Martin Storsjö
c8f0e88b20 rtpdec: Templatize the code for different g726 bitrate variants 
Signed-off-by: Martin Storsjö <martin@martin.st>
 2011-11-30 23:20:07 +02:00
Janne Grunau
bb8a6e03cc rv40: move loop filter to rv34dsp context 
Signed-off-by: Mans Rullgard <mans@mansr.com>
 2011-11-30 20:54:59 +00:00
Michael Niedermayer
77af2672b4 lavc: Fix side data handling for audio decoders. 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-11-30 21:19:23 +01:00
Michael Niedermayer
11828b8885 nellymoserdec: Use sidedata to support mid stream sample rate changes. 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-11-30 21:17:57 +01:00
Michael Niedermayer
957a593cd9 flvdemux: export flags for nellymoser through side data. 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-11-30 21:16:33 +01:00
Anton Khirnov
c3f9ebf743 lavf: make av_set_pts_info private. 
It's supposed to be called only from (de)muxers.
 2011-11-30 20:34:45 +01:00
Michael Niedermayer
8f025f2f60 avfilter: align allocated images to 32 for AVX and IFF 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-11-30 18:53:47 +01:00
Michael Niedermayer
fd3e75d2d4 lavc: horizontal align for IFF 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-11-30 18:45:33 +01:00
Michael Niedermayer
8d5078c10b ac3probe: Change threshold from 500 to 200 to keep in sync with mp3. 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-11-30 18:08:23 +01:00
Michael Niedermayer
b51eaf3b8c mp3probe: Detect mp3 stronger with just 200 frames, this should speed up detection 
on mp3 streams.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-11-30 18:07:20 +01:00
Miroslav Slugeň
06d7325ab1 rtpdec: Add support for G726 audio 
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>
 2011-11-30 17:39:32 +02:00
Martin Storsjö
2583660664 rtpdec: Add an init function that can do custom codec context initialization 
Signed-off-by: Martin Storsjö <martin@martin.st>
 2011-11-30 17:32:18 +02:00
Michael Niedermayer
dd32a305bd wmall: fix return type of dump_int_buffer() 
Found-by: Dominique Leuenberger
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-11-30 15:23:39 +01:00
Michael Niedermayer
4710993800 movenc: memset(0) new cluster elements after realloc() 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-11-30 15:23:34 +01:00
Michael Niedermayer
dae7ff0416 wmall: remove tabs that leaked in from a merge and seem to have 
managed to silently bypass the push checks.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-11-30 15:21:46 +01:00
Anton Khirnov
7bb3e62594 avconv: make copy_tb on by default. 
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.
 2011-11-30 07:47:43 +01:00
Anton Khirnov
c98c1f434e matroskadec: don't set codec timebase. 
It's not supposed to be set outside of lavc.
 2011-11-30 07:47:43 +01:00
Anton Khirnov
d3e3ffa501 rmdec: don't set codec timebase. 
It's not supposed to be set outside of lavc.
Set r_frame_rate instead.
 2011-11-30 07:47:43 +01:00
Anton Khirnov
741a05a293 avconv: compute next_pts from input packet duration when possible. 2011-11-30 07:47:43 +01:00
Anton Khirnov
2092232581 lavf: estimate frame duration from r_frame_rate. 
If r_frame_rate is set, it should be more reliable for this than either
codec or stream timebase.
 2011-11-30 07:47:43 +01:00
Anton Khirnov
91b412e786 avconv: update InputStream.pts in the streamcopy case. 
This was broken in 2a651b719c.
 2011-11-30 07:47:43 +01:00
Joseph Wecker
b55dd10d62 Fix typeo in some rarely used memoization 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-11-30 05:28:08 +01:00
Joseph Wecker
d31c68a7ed removes spurious warning 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-11-30 05:28:07 +01:00
Michael Niedermayer
c40a35f8a7 Merge remote-tracking branch 'qatar/master' 
* 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>
 2011-11-30 02:34:35 +01:00
Jean First
23b4f355bb ffmpeg.c use b:v for video bitrates using a target 
it's more consistent to use -b:v instead of just -b

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-11-30 00:22:31 +01:00
Clément Bœsch
b6ffe441cd ffmpeg: do not use a negative total_size (AVERROR) in bitrate estimation. 2011-11-29 23:07:13 +01:00
Reimar Döffinger
7076967786 Consistently use %ifdef ARCH_X86_64 
One out of 3 places used ifndef, which is needlessly confusing.

Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
 2011-11-29 19:55:38 +01:00
Aneesh Dogra
464ccb0144 indeo3: check per-plane data buffer against input buffer bounds. 
Fixes : http://bugzilla.libav.org/show_bug.cgi?id=102

Signed-off-by: Alex Converse <alex.converse@gmail.com>
 2011-11-29 09:58:05 -08:00
root
551b9eb9ef docs: Spelling fixes to 9 texi files from /doc 
credits to: Violet Lin (from Google Code-in)

Signed-off-by: burek <burek021@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-11-29 18:26:06 +01:00
root
b0a90c2004 faq.texi: fix spelling errors 
credits to: Philip (from Google Code-in)
Signed-off-by: burek <burek021@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-11-29 18:25:43 +01:00
root
aadbf9f74c developer.texi: fix spelling errors 
credits to: KayC (from Google Code-in)
Signed-off-by: burek <burek021@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-11-29 18:25:18 +01:00
root
1c212a6465 general.texi: fix spelling errors 
credits to: Samuel M (from Google Code-in)
Signed-off-by: burek <burek021@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-11-29 18:24:28 +01:00
Michael Niedermayer
4b4a02b847 lavc: dont call set_dimensions() on h264 codec init. 
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>
 2011-11-29 17:33:35 +01:00
Clément Bœsch
81a65b82fb swr: handle correctly muted channel with u8 sample fmt. 2011-11-29 17:14:25 +01:00
Geek.Song
9cdf048ad2 movenc: Remove unneeded chunkSize field from MOVIentry 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-11-29 16:50:25 +01:00
Michael Niedermayer
313d30c180 avutil: revert project name messing 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-11-29 16:09:56 +01:00
Michael Niedermayer
6ffdc262b0 ac3enc: clenaup project name in one comment 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-11-29 16:09:56 +01:00
Alex Converse
fdab793a46 avconv: Handle audio sync for non-S16 sample formats. 
Also fix reporting of the number of samples added/dropped.
 2011-11-28 22:18:09 -08:00
Aaron Colwell
39a7a5b8ab pthread: don't increment index on zero-sized packets. 
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>
 2011-11-28 20:30:30 -08:00