libav.git - [no description]

	Commit message (Collapse)	Author	Age
*	Merge remote-tracking branch 'qatar/master'	Michael Niedermayer	2011-12-01
\|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* 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>
\| *	lavf: make av_set_pts_info private.	Anton Khirnov	2011-11-30
\| \| \| \| \| \| \| \|	It's supposed to be called only from (de)muxers.
\| *	Replace FFmpeg with Libav in licence headers	Mans Rullgard	2011-03-19
\| \| \| \| \| \| \| \|	Signed-off-by: Mans Rullgard <mans@mansr.com>
\| *	Fix compile warning.	Ronald S. Bultje	2011-02-06
\| \| \| \| \| \| \| \| \| \|	Change int64_t into a int, which caused this compiler warning: libavformat/oggparseskeleton.c:64: warning: passing argument 2 of ‘av_reduce’ from incompatible pointer type
\| *	Always use av_set_pts_info to set the stream time base.	Reimar Döffinger	2011-02-06
\| \| \| \| \| \| \| \|	Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
* \|	Fix compile warning.	Ronald S. Bultje	2011-02-09
\| \| \| \| \| \| \| \| \| \| \| \|	Change int64_t into a int, which caused this compiler warning: libavformat/oggparseskeleton.c:64: warning: passing argument 2 of ‘av_reduce’ from incompatible pointer type (cherry picked from commit 69ff14920429c9e128a8bcf65ce3f4b4aa93f3d1)
* \|	Always use av_set_pts_info to set the stream time base.	Reimar Döffinger	2011-02-05
\|/
*	Define AVMediaType enum, and use it instead of enum CodecType, which	Stefano Sabatini	2010-03-30
\| \| \| \| \| \|	is deprecated and will be dropped at the next major bump. Originally committed as revision 22735 to svn://svn.ffmpeg.org/ffmpeg/trunk
*	correct first pts for ogg skeleton	Aurelien Jacobs	2010-03-28
\| \| \| \|	Originally committed as revision 22705 to svn://svn.ffmpeg.org/ffmpeg/trunk
*	oggdec: Parse skeleton to determine the start time of each stream	David Conrad	2010-03-11
	Originally committed as revision 22457 to svn://svn.ffmpeg.org/ffmpeg/trunk