virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-23 12:43:46 +02:00
Code Issues Releases Activity
35,451 Commits 37 Branches 400 Tags 465 MiB
707138593a
Commit Graph

35451 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Michael Niedermayer
fc09bf57a6 movenc: Write file with minimal number of chunks for the given interleaving. 
Reviewed-by: Baptiste Coudurier <baptiste.coudurier@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-11-29 04:51:47 +01:00
Michael Niedermayer
4dcd1a3145 Merge remote-tracking branch 'qatar/master' 
* 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>
 2011-11-29 00:20:29 +01:00
Alex Converse
ac47e014bb adtsenc: Check frame size. 
Inspired by work from: Michael Niedermayer <michaelni@gmx.at>.

Signed-off-by: Alex Converse <alex.converse@gmail.com>
 2011-11-28 11:22:40 -08:00
Alex Converse
a27805189b txd: Fix order of operations. 2011-11-28 11:22:36 -08:00
Mans Rullgard
b94a3b288e APIchanges: fill in some blanks 
Signed-off-by: Mans Rullgard <mans@mansr.com>
 2011-11-28 17:29:47 +00:00
Michael Niedermayer
4b03d96022 ffv1dec: use PIX_FMT_0RGB32 when there is no transparency plane 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-11-28 17:41:27 +01:00
Michael Niedermayer
2027d073ae ffv1dec: transparency plane support. 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-11-28 17:40:39 +01:00
Michael Niedermayer
492aab8589 ffv1enc: PIX_FMT_0RGB32 support 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-11-28 17:39:25 +01:00
Michael Niedermayer
f7b160e829 ffv1enc: Store transparency plane. 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-11-28 17:38:04 +01:00
Mans Rullgard
60084a1723 timer: fix misspelling of "decicycles" 
Signed-off-by: Mans Rullgard <mans@mansr.com>
 2011-11-28 14:34:42 +00:00
Michael Niedermayer
ae5873f13b huffyuvenc: switch from alphaless rgb32 to rgb24 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-11-28 15:14:41 +01:00
Clément Bœsch
fbe6e29646 ffprobe: print codec timecode if available. 2011-11-28 14:06:02 +01:00
Clément Bœsch
b1ca5634fd mpeg12: raise timecode to codec context. 2011-11-28 14:06:02 +01:00
Diego Biurrun
c88ebdb42c Eliminate pointless 0/NULL initializers in AVCodec and similar declarations. 2011-11-28 10:01:50 +01:00
Kostya Shishkov
1469f943ad indeo3: cosmetics 
Signed-off-by: Diego Biurrun <diego@biurrun.de>
 2011-11-28 10:01:49 +01:00
Carl
2cf4bd7751 sdp: Fix null pointer dereference with aac and ffserver. 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-11-28 04:29:47 +01:00
Michael Niedermayer
d3fc335bac huffyuvenc: support alphaless rgb32 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-11-28 04:29:42 +01:00
Michael Niedermayer
0af7d7082f huffyuvenc: store alpha for bgr32 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-11-28 04:14:22 +01:00
Michael Niedermayer
b89ce2d6af swscale: alpha less rgb32 support. 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-11-28 04:14:22 +01:00
Michael Niedermayer
b14a2381f8 pixfmt: Add 32bit rgb without alpha formats 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-11-28 02:44:05 +01:00
Alex Converse
2b45222b6a md5proto: Fix order of operations. 2011-11-27 16:16:44 -08:00
Michael Niedermayer
1e19927f12 Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  vc1: use an enum for Frame Coding Mode
  doc: cleanup filter section
  indeo3: error out if no motion vector is set.
  x86inc: Flag shufps as an floating-point instruction for the AVX emulation code.
  mpegaudio: do not use init_static_data() for initializing tables.
  musepack: fix signed shift overflow in mpc_read_packet()
  mov: Make format string match variable type.
  wmavoice: Make format string match variable type.
  vc1: select interlaced scan table by FCM element
  Generalize RIFF INFO tag support; support reading INFO tag in wav
  pthread: track thread existence in a separate variable.

Conflicts:
	doc/filters.texi
	libavcodec/pthread.c
	libavformat/avi.c
	libavformat/riff.c
	libavformat/riff.h
	libavformat/wav.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2011-11-28 01:07:11 +01:00
Alex Converse
999e7ebd23 dca: Replace oversized unused get_bits() with skip_bits_long(). 2011-11-27 15:57:38 -08:00
Luca Barbato
1f948745c3 vc1: use an enum for Frame Coding Mode 
Document it a little and possibly fix a bug in dxva2_vc1.
 2011-11-28 00:40:22 +01:00
Luca Barbato
9270b8a3d1 doc: cleanup filter section 
Use the @command{} tag when needed and cleanup the examples.
 2011-11-28 00:39:59 +01:00
Vitor Sessak
ca55606a51 x86inc: Flag shufps as an floating-point instruction for the AVX emulation code. 
Without this, code like "shufps m0, m1, m2, 0xaa" would not work in CPUs
not supporting SSE2.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-11-28 00:24:21 +01:00
Aneesh Dogra
97980db487 indeo3: error out if no motion vector is set. 
This fixes a crash on a corrupt bitstream (bugzilla #93).

Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
 2011-11-27 13:30:00 -08:00