generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
43,799 Commits 24 Branches 241 Tags 173 MiB
e16fda9236
Commit Graph

43799 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Michael Niedermayer
ba2cf854d0 lavc: move AVRn to a seperate decoder. 
The special cases in demuxers and decoders are a mess otherwise (and more
would be needed to support it fully)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-08-20 02:46:09 +02:00
Giorgio Vazzana
1e6072139b swscale: x86: fix #endif comments in rgb2rgb template file 
Signed-off-by: Diego Biurrun <diego@biurrun.de>
 2012-08-19 21:50:09 +02:00
Anton Khirnov
602b1898e5 avconv: mark more options as expert. 2012-08-19 19:26:20 +02:00
Anton Khirnov
f9fada2704 avconv: split printing "main options" into global and per-file. 2012-08-19 19:23:43 +02:00
Anton Khirnov
6e3857fa8c avconv: refactor help printing. 
By default don't dump every single option on the user, but print only
the basic options.

Add -h long/full to print more options.
 2012-08-19 19:23:17 +02:00
Anton Khirnov
f8b1e66553 avconv: print info/capabilities options in a separate help group. 2012-08-19 19:23:06 +02:00
Anton Khirnov
1136bd362a avtools: add -h demuxer/muxer 2012-08-19 19:22:41 +02:00
Anton Khirnov
a3ad68d36c cmdutils: extend -h to allow printing codec details. 2012-08-19 19:22:08 +02:00
Anton Khirnov
7c5012127f cmdutils: change semantics of show_help_options() and document it. 
Currently it takes a mask and value, such that options for which
(flags & mask) == value.

Change it to take required flags and forbidden flags instead. This is
shorter and simpler to understand.
 2012-08-19 19:21:35 +02:00
Anton Khirnov
dc4c24a3d3 avtools: move some newlines to show_help_options(). 
Don't require every caller to supply them.
 2012-08-19 19:21:03 +02:00
Anton Khirnov
79600a8354 avconv: deprecate -isync. 
This option does not do anything.

Also remove OPT_GRAB, since -isync is the last option using it.
 2012-08-19 19:20:14 +02:00
Anton Khirnov
8fc83fb081 avconv: reformat the options table. 2012-08-19 19:15:51 +02:00
Anton Khirnov
d3810c47fe avconv: get rid of ugly casts in the options table. 2012-08-19 19:09:36 +02:00
Anton Khirnov
db4766ad1b avconv: try to match codecs by codec descriptor name as a last resort. 
This allows e.g. -c:v h264 to select the libx264 encoder.
 2012-08-19 19:08:48 +02:00
Anton Khirnov
f617135bc9 avtools: fix show_foo() signatures. 
show_foo() functions are declared as void show_foo(void), but called as
int show_foo(const char*, const char*).
 2012-08-19 19:07:43 +02:00
rogerdpack
a93c221ccd dshow: protect access to curbufsize 
Signed-off-by: rogerdpack <rogerpack2005@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-08-19 18:36:26 +02:00
rogerdpack
42dbf06df0 dshow: cleanup reference 
Signed-off-by: rogerdpack <rogerpack2005@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-08-19 18:30:50 +02:00
Nicolas George
c28d80f4c9 lavc: avcodec_get_name: return "none" for AV_CODEC_ID_NONE. 2012-08-19 15:26:05 +02:00
Michael Niedermayer
c9fe864472 Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  vorbisdec: remove some pointless comments
  avprobe: add const to AVCodec pointer
  libavformat: add const to AVCodec pointers
  pthread: add const to AVCodec pointers

Conflicts:
	ffprobe.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2012-08-19 14:55:58 +02:00
Mans Rullgard
4855022aa1 vorbisdec: remove some pointless comments 
Signed-off-by: Mans Rullgard <mans@mansr.com>
 2012-08-19 12:59:58 +01:00
Nicolas George
5980e57cf9 lavfi: add volumedetect filter. 2012-08-19 11:37:05 +02:00
Nicolas George
13b965ead4 ffmpeg: reindent after last commit. 2012-08-19 11:23:59 +02:00
Nicolas George
429c6cab1c ffmpeg: reduce differences with avconv for in/out scheduling. 
Rework the transcode() function and its immediate annexes to have
the same structure as in avconv, while still maintaining proper
scheduling to avoid accumulation.

Using -filter_complex without inputs now works.
 2012-08-19 11:20:56 +02:00
Michael Niedermayer
af5086087e ffmpeg: Clip invalid video timestamps like audio instead of failing hard. 
Fixes Ticket976

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-08-19 02:42:53 +02:00
Michael Niedermayer
0de4918f32 rawdec: support AVRn 1:1 raw interlaced mode 
Fixes Ticket971

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-08-18 23:55:59 +02:00
Stefano Sabatini
e35c0ee05c lavf/segment: fix computation of M3U8 segment target duration 
Use ceil on the max duration, rather than approximating it to the nearest
integer.
 2012-08-18 22:46:12 +02:00
Michael Niedermayer
a21f65b55e elbg: switch to av_assert 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-08-18 21:54:52 +02:00
Michael Niedermayer
9018f8c328 elbg: fix assert 
It seems the condition was flipped from what was intended

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-08-18 21:53:32 +02:00
Michael Niedermayer
28ff17fa97 lavf: add use_wallclock_as_timestamps 
This may fix Ticket730

Reviewed-by: Nicolas George <nicolas.george@normalesup.org>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-08-18 19:19:47 +02:00
Nicolas George
92b8c9d89e lavf/au: check bits per coded sample. 
Without that, it would repeatedly produce empty packets
if the codec if forced to something invalid.

Fix trac ticket #1652.
 2012-08-18 17:45:58 +02:00
Michael Niedermayer
7f46f042d1 buildsys: fix cleaning of libmpcodecs 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-08-18 16:36:16 +02:00
Uoti Urpala
e70730045a h264: vdpau: fix crash with unsupported colorspace 
The h264_vdpau decoder crashed if output colorspace was not 8-bit 420.
Add a check to error out instead (current hardware does not support
other colorspaces, so successful decoding is not possible).

Check implemented at a different place by michael, thus blame for bugs goes to michael
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-08-18 16:36:09 +02:00
Mans Rullgard
8b13445791 avprobe: add const to AVCodec pointer 
Signed-off-by: Mans Rullgard <mans@mansr.com>
 2012-08-18 14:20:57 +01:00
Mans Rullgard
edb5238ccb libavformat: add const to AVCodec pointers 
Signed-off-by: Mans Rullgard <mans@mansr.com>
 2012-08-18 14:20:57 +01:00
Mans Rullgard
11434c9b13 pthread: add const to AVCodec pointers 
Signed-off-by: Mans Rullgard <mans@mansr.com>
 2012-08-18 14:20:57 +01:00
Michael Niedermayer
6c180b35c4 Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  mpegvideo_enc: don't use deprecated avcodec_encode_video().
  cmdutils: refactor -codecs option.
  avconv: make -shortest a per-output file option.
  lavc: add avcodec_descriptor_get_by_name().
  lavc: add const to AVCodec* function parameters.
  swf(dec): replace CODEC_ID with AV_CODEC_ID
  dvenc: don't use deprecated AVCODEC_MAX_AUDIO_FRAME_SIZE
  rtmpdh: Do not generate the same private key every time when using libnettle
  rtp: remove ff_rtp_get_rtcp_file_handle().
  rtsp.c: use ffurl_get_multi_file_handle() instead of ff_rtp_get_rtcp_file_handle()
  avio: add (ff)url_get_multi_file_handle() for getting more than one fd
  h264: vdpau: fix crash with unsupported colorspace
  amrwbdec: Decode the fr_quality bit properly

Conflicts:
	Changelog
	cmdutils.c
	cmdutils_common_opts.h
	doc/ffmpeg.texi
	ffmpeg.c
	ffmpeg.h
	ffmpeg_opt.c
	libavcodec/h264.c
	libavcodec/options.c
	libavcodec/utils.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2012-08-18 15:20:32 +02:00
Stefano Sabatini
69fc2489c4 doc/muxers: simplify segment examples 
The simplifications are due to the recent option changes.
 2012-08-18 12:32:54 +02:00
Stefano Sabatini
2d31ae2921 lavf/segment: change default value for segment_list_size option, from 5 to 0 
This is technically a major compatibility break, but seems the most
natural default and what users would expect without reading the docs.
 2012-08-18 12:32:23 +02:00
Stefano Sabatini
1c522e3868 lavf/segment: guess list type from list filename suffix 2012-08-18 12:31:49 +02:00
Stefano Sabatini
dc7e4d685f lavfi/mp: remove framestep wrapped filter 
An equivalent framestep filter has been natively integrated.
 2012-08-18 12:14:46 +02:00
Stefano Sabatini
48d116400c lavfi: add framestep filter 
This filter is inspired upon libmpcodecs/vf_framestep.c, by Daniele
Forghieri.

Only-keyframe output is not supported, since that feature can be achieved
through the more versatile select filter.
 2012-08-18 12:13:34 +02:00
Stefano Sabatini
7cd5fa35fe lavfi/testsrc: set output framerate 2012-08-18 12:02:43 +02:00
Stefano Sabatini
e5ae2f9126 lavf/segment: add M3U8 list support 
Address trac ticket #1642.
 2012-08-18 11:21:47 +02:00
Stefano Sabatini
4a12d1e8e7 lavf/segment: compute max list segment duration 
This is useful for the M3U8 format incoming patch.
 2012-08-18 11:21:47 +02:00
Stefano Sabatini
769500c2a3 lavf/segment: create segment_list_open and close functions 
Allow factorization for the incoming patches, and avoid code/logic
duplication.
 2012-08-18 11:21:47 +02:00
Stefano Sabatini
d3a2a614bf lavf/segment: fix bogus segment index rewrapping logic 
Decouple segment index wrapping and segment count logic. The counter
should not be reset since it detects the segment increasing timeframe.
 2012-08-18 11:21:47 +02:00
Stefano Sabatini
b89e00bd1c lavf/segment: move file description to @file doxy 2012-08-18 11:21:47 +02:00
Stefano Sabatini
725213545d lavf/avio: flush internal buffer when calling avio_close() 
This seems the expected behavior.
 2012-08-18 11:21:44 +02:00
Stefano Sabatini
63f57f8530 lavf/avio.h: doxygen avio_flush() 2012-08-18 11:21:42 +02:00
Stefano Sabatini
5296d7b971 ffmpeg,ffplay: show filter options 
Address trac ticket #1599.
 2012-08-18 10:19:10 +02:00