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
55,269 Commits 37 Branches 400 Tags 460 MiB
4ee0984341
Commit Graph

55269 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Michael Niedermayer
4ee0984341 Merge commit 'a0ad5d011318f951ecd4c9ffe1829518c9533909' 
* commit 'a0ad5d011318f951ecd4c9ffe1829518c9533909':
  vdpau: deprecate old codec-specific pixel formats

Conflicts:
	libavutil/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-08-06 13:45:21 +02:00
Michael Niedermayer
bf36dc50ea Merge commit '578ea75a9e4ac56e0bbbbe668700be756aa699f8' 
* commit '578ea75a9e4ac56e0bbbbe668700be756aa699f8':
  vdpau: remove old-style decoders

Conflicts:
	libavcodec/allcodecs.c
	libavcodec/h263dec.c
	libavcodec/h264.c
	libavcodec/mpeg12dec.c
	libavcodec/mpeg4videodec.c
	libavcodec/vc1dec.c
	libavcodec/vdpau.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-08-06 13:24:22 +02:00
Michael Niedermayer
b7fc2693c7 Merge commit '488a0fa68973d48e264d54f1722f7afb18afbea7' 
* commit '488a0fa68973d48e264d54f1722f7afb18afbea7':
  avconv: support -t as an input option.

Conflicts:
	Changelog
	ffmpeg.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-08-06 12:41:04 +02:00
Michael Niedermayer
6d77279ed8 ffmpeg_opt: Remove support for specifying -t anywhere to set the duration 
This would otherwise conflict with the semantics of using -t for the input

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-08-06 12:06:28 +02:00
Michael Niedermayer
7cbef2ed7e Merge commit '811bd0784679dfcb4ed02043a37c92f9df10500e' 
* commit '811bd0784679dfcb4ed02043a37c92f9df10500e':
  avconv: make input -ss accurate when transcoding

Conflicts:
	Changelog
	doc/ffmpeg.texi
	ffmpeg.h
	ffmpeg_filter.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-08-06 11:39:09 +02:00
Michael Niedermayer
3fa72de82f Merge commit '56ee3f9de7b9f6090d599a27d33a392890a2f7b8' 
* commit '56ee3f9de7b9f6090d599a27d33a392890a2f7b8':
  avconv: distinguish between -ss 0 and -ss not being used

Conflicts:
	ffmpeg.c
	ffmpeg_opt.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-08-06 10:25:32 +02:00
Michael Niedermayer
84bc317019 Merge commit '2e661f26f8b12195f75ae3b07d9591e395135bc7' 
* commit '2e661f26f8b12195f75ae3b07d9591e395135bc7':
  avconv: insert extra filters in the same way for both graph inputs and outputs

Conflicts:
	ffmpeg_filter.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-08-06 10:08:17 +02:00
Michael Niedermayer
bb5ef96164 Merge commit '3799376dd3373ee255651ed542c75b15665801a8' 
* commit '3799376dd3373ee255651ed542c75b15665801a8':
  lavfi/fifo: fix flushing when using request_samples

Conflicts:
	libavfilter/fifo.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-08-06 09:35:03 +02:00
Michael Niedermayer
a59a64cbc8 Merge commit '06cd4c5a68e23f5be199c0d2d563da80989f839f' 
* commit '06cd4c5a68e23f5be199c0d2d563da80989f839f':
  avconv: fix usage of deprecated lavfi API

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-08-06 09:20:22 +02:00
Michael Niedermayer
4131f21f77 Merge commit '612a5049d9b4ac1c2a293daf75fe814b7a94fdc7' 
* commit '612a5049d9b4ac1c2a293daf75fe814b7a94fdc7':
  avserver: do not use a static string as a default for a string option

See: 19c41c6d8e
Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-08-06 09:13:51 +02:00
Marton Balint
a7bb12a307 mpegts: add fix_teletext_pts mpegts demuxer option 
Changes since v1 of the patch:
- enable option by default
- add documentation
- move up PTS override code after PES header parsing, to ensure we use the
  last PCR before the first packet of the teletext PES packet.

The option overrides teletext packet PTS and DTS values with the timestamps
calculated from the PCR of the first program which the teletext stream is part
of and is not discarded.

Using the same teletext PID for multiple programs is possible, therefore we
need some kind of heuristics to know which program PCR we should synchronize
to. Using the first non-discarded PCR pid among the programs of the teletext
stream seemed like a good choice.

The patch does not do PCR interpolation to estimate the PCR of the teltetext
packet, it just uses the last PCR of the program, which may cause a slight
error (0.1 sec) in the teletext packet pts-es.

Based on a patch by Reimar Döffinger.
http://lists.ffmpeg.org/pipermail/ffmpeg-devel/2012-September/131610.html

Signed-off-by: Marton Balint <cus@passwd.hu>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-08-06 02:47:38 +02:00
Carl Eugen Hoyos
4c15f3491f Set bits_per_raw_sample when decoding pnm. 2013-08-06 00:26:21 +02:00
Wei-Cheng Pan
f646cd4471 rtp: Make ff_rtp_codec_id() case insensitive 
Fixes handling of lower case pcmu

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-08-05 21:53:52 +02:00
Timothy Gu
3217a706e2 libxvid: Reduce the size of an array 
It is not possible to have a plugin[] array with 5 or more elements.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-08-05 15:11:17 +02:00
Michael Niedermayer
1ccc2157ff avcodec/libxvid: Partially check plugins array size with assert 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-08-05 15:06:04 +02:00
Michael Niedermayer
412df0a52f avcodec/libxvid: set lumi_aq for lumimasking 
Simplifies check and should fix lumi+vari warning

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-08-05 15:06:04 +02:00
Rémi Denis-Courmont
a0ad5d0113 vdpau: deprecate old codec-specific pixel formats 
Signed-off-by: Anton Khirnov <anton@khirnov.net>
 2013-08-05 11:16:54 +02:00
Rémi Denis-Courmont
578ea75a9e vdpau: remove old-style decoders 
Signed-off-by: Anton Khirnov <anton@khirnov.net>
 2013-08-05 11:15:49 +02:00
Anton Khirnov
488a0fa689 avconv: support -t as an input option. 
It limits the duration of the data read from a given input.
 2013-08-05 10:54:19 +02:00
Anton Khirnov
811bd07846 avconv: make input -ss accurate when transcoding 
Insert (a)trim filters on the corresponding inputs, so the extra frames
are decoded and discarded.
 2013-08-05 10:53:41 +02:00
Anton Khirnov
56ee3f9de7 avconv: distinguish between -ss 0 and -ss not being used 
Using -ss 0 to drop frames with negative timestamps is a perfectly valid
use case.
 2013-08-05 10:53:12 +02:00
Anton Khirnov
2e661f26f8 avconv: insert extra filters in the same way for both graph inputs and outputs 
This will allow using the same code when one filter can be inserted both
on input and output.
 2013-08-05 10:52:22 +02:00
Anton Khirnov
3799376dd3 lavfi/fifo: fix flushing when using request_samples 
If any samples are still buffered when request_frame returns EOF, they
won't be returned currently.
 2013-08-05 10:52:00 +02:00
Anton Khirnov
06cd4c5a68 avconv: fix usage of deprecated lavfi API 2013-08-05 10:51:41 +02:00
James Almer
1ca3902726 fate: Add vorbiscomment cover art test 
Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-08-05 10:48:37 +02:00
Michael Niedermayer
22458ccbcc avcodec/tta: use init_get_bits8() 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-08-05 10:15:03 +02:00
Michael Niedermayer
89c3f5a907 avformat/takdec: use init_get_bits8() 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-08-05 10:14:42 +02:00
Michael Niedermayer
263da1a8f7 avcodec/eatgq: use init_get_bits8() 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-08-05 10:14:14 +02:00
Michael Niedermayer
5dff269998 avcodec/diracdec: use init_get_bits8() 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-08-05 10:13:48 +02:00
Michael Niedermayer
6ed1aa4f85 avcodec/ra144dec: use init_get_bits8() 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-08-05 10:13:21 +02:00
Michael Niedermayer
77e37c34cb avformat/latmenc: use init_get_bits8() 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-08-05 10:12:46 +02:00
Michael Niedermayer
dd98d9d1ff Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  mxfenc: switch to av_reallocp_array() and check allocation errors

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-08-05 09:57:28 +02:00
Michael Niedermayer
d6c36fba0b Merge commit 'a10c4ce24bd4a0dd557d5849aa53a0cc74677808' 
* commit 'a10c4ce24bd4a0dd557d5849aa53a0cc74677808':
  aac: Forward errors properly in aac_decode_frame_int

Conflicts:
	libavcodec/aacdec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-08-05 09:52:06 +02:00
Michael Niedermayer
48af87819a Merge commit '71953ebcf94fe4ef316cdad1f276089205dd1d65' 
* commit '71953ebcf94fe4ef316cdad1f276089205dd1d65':
  aac: Check init_get_bits return value

Conflicts:
	libavcodec/aacdec.c

See: 73abc3a634

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-08-05 09:46:04 +02:00
Michael Niedermayer
783c674da7 Merge commit '51fc88e7467169031b20b9983d80456b893a9fa3' 
* commit '51fc88e7467169031b20b9983d80456b893a9fa3':
  avconv: improve some variable names

Conflicts:
	ffmpeg_filter.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-08-05 09:32:31 +02:00
Michael Niedermayer
46b3dbf9ca Merge commit '77cc958f60f73963be4281d6e82ef81707e40c26' 
* commit '77cc958f60f73963be4281d6e82ef81707e40c26':
  lavfi: add const to the AVFilter parameter of avfilter_graph_create_filter()

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-08-05 09:22:18 +02:00
Michael Niedermayer
c4f9a4cd2f rdt: make const tables static const 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-08-05 02:53:16 +02:00
Michael Niedermayer
1787432b23 mp3dec: make const tables static const 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-08-05 02:52:41 +02:00
Michael Niedermayer
6bbcae2c16 avcodec/fft: Fix "warning: unused variable" 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-08-04 22:52:10 +02:00
Michael Niedermayer
62cf5c114a avformat/matroskadec: make sipr_bit_rate static const 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-08-04 21:18:49 +02:00
Anton Khirnov
612a5049d9 avserver: do not use a static string as a default for a string option 
Fixes an invalid free.

Bug-id: 448
 2013-08-04 18:47:22 +02:00
Alexandra Khirnova
7684a36113 mxfenc: switch to av_reallocp_array() and check allocation errors 
Signed-off-by: Anton Khirnov <anton@khirnov.net>
 2013-08-04 16:49:04 +02:00
Luca Barbato
a10c4ce24b aac: Forward errors properly in aac_decode_frame_int 
Incidentally also remove a warning.
 2013-08-04 16:05:36 +02:00
Luca Barbato
71953ebcf9 aac: Check init_get_bits return value 
Some code paths can call it with invalid length.

CC: libav-stable@libav.org
 2013-08-04 16:05:36 +02:00
Anton Khirnov
51fc88e746 avconv: improve some variable names 
'filter' is too generic, since the functions in question deal with
several filters.

Also add const qualifiers to those variables.
 2013-08-04 15:46:19 +02:00
Anton Khirnov
77cc958f60 lavfi: add const to the AVFilter parameter of avfilter_graph_create_filter() 
This function should never modify the filter.
 2013-08-04 15:46:19 +02:00
Nedeljko Babic
18d7074b4e libavcodec: Implementation of 32 bit fixed point FFT 
Iterative implementation of 32 bit fixed point split-radix FFT.
Max FFT that can be calculated currently is 2^12.

Signed-off-by: Nedeljko Babic <nbabic@mips.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-08-04 14:01:41 +02:00
Andrey Utkin
27cc3e72f8 doc/muxers: Document use case of mpegts muxer option tables_version 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-08-04 13:35:54 +02:00
Timothy Gu
3415058541 vf_scale: add force_original_aspect_ratio 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-08-04 13:27:01 +02:00
Michael Niedermayer
48188a5120 MAINTAINERS: order libavutil entries alphabetically 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-08-04 11:24:57 +02:00