Paul B Mahol 
							
						 
					 
					
						
						
							
						
						74906d3727 
					 
					
						
						
							
							avcodec/libopusenc: change default frame duration to 20 ms  
						
						... 
						
						
						
						20 ms is used by libopus encoder.
Signed-off-by: Paul B Mahol <onemda@gmail.com > 
						
						
					 
					
						2013-11-18 01:46:32 +00:00 
						 
				 
			
				
					
						
							
							
								Michael Niedermayer 
							
						 
					 
					
						
						
							
						
						ee77140afa 
					 
					
						
						
							
							Merge commit 'b2bed9325dbd6be0da1d91ffed3f513c40274fd2'  
						
						... 
						
						
						
						* commit 'b2bed9325dbd6be0da1d91ffed3f513c40274fd2':
  cosmetics: Group .name and .long_name together in codec/format declarations
Conflicts:
	libavcodec/8svx.c
	libavcodec/alac.c
	libavcodec/cljr.c
	libavcodec/dnxhddec.c
	libavcodec/dnxhdenc.c
	libavcodec/dpxenc.c
	libavcodec/dvdec.c
	libavcodec/dvdsubdec.c
	libavcodec/dvdsubenc.c
	libavcodec/ffv1dec.c
	libavcodec/flacdec.c
	libavcodec/flvdec.c
	libavcodec/fraps.c
	libavcodec/frwu.c
	libavcodec/g726.c
	libavcodec/gif.c
	libavcodec/gifdec.c
	libavcodec/h261dec.c
	libavcodec/h263dec.c
	libavcodec/iff.c
	libavcodec/imc.c
	libavcodec/libopencore-amr.c
	libavcodec/libopenjpegdec.c
	libavcodec/libopenjpegenc.c
	libavcodec/libspeexenc.c
	libavcodec/libvo-amrwbenc.c
	libavcodec/libvorbisenc.c
	libavcodec/libvpxenc.c
	libavcodec/libx264.c
	libavcodec/libxavs.c
	libavcodec/libxvid.c
	libavcodec/ljpegenc.c
	libavcodec/mjpegbdec.c
	libavcodec/mjpegdec.c
	libavcodec/mpeg12dec.c
	libavcodec/mpeg4videodec.c
	libavcodec/msmpeg4dec.c
	libavcodec/pgssubdec.c
	libavcodec/pngdec.c
	libavcodec/pngenc.c
	libavcodec/proresdec_lgpl.c
	libavcodec/proresenc_kostya.c
	libavcodec/ra144enc.c
	libavcodec/rawdec.c
	libavcodec/rv10.c
	libavcodec/sp5xdec.c
	libavcodec/takdec.c
	libavcodec/tta.c
	libavcodec/v210dec.c
	libavcodec/vp6.c
	libavcodec/wavpack.c
	libavcodec/xbmenc.c
	libavcodec/yop.c
Merged-by: Michael Niedermayer <michaelni@gmx.at > 
						
						
					 
					
						2013-10-04 12:34:23 +02:00 
						 
				 
			
				
					
						
							
							
								Diego Biurrun 
							
						 
					 
					
						
						
							
						
						b2bed9325d 
					 
					
						
						
							
							cosmetics: Group .name and .long_name together in codec/format declarations  
						
						
						
						
					 
					
						2013-10-03 23:32:01 +02:00 
						 
				 
			
				
					
						
							
							
								Vignesh Venkatasubramanian 
							
						 
					 
					
						
						
							
						
						ae12d65538 
					 
					
						
						
							
							lavcodec: Adding support for End Trimming in Opus encoder  
						
						... 
						
						
						
						Adds the end trimming value (duration to be trimmed from the end
of the file due to padding) to the packet's side data. This is
then made use by the muxer to put the value in the container.
Signed-off-by: Vignesh Venkatasubramanian <vigneshv@google.com >
Signed-off-by: Michael Niedermayer <michaelni@gmx.at > 
						
						
					 
					
						2013-09-11 01:03:07 +02:00 
						 
				 
			
				
					
						
							
							
								Michael Niedermayer 
							
						 
					 
					
						
						
							
						
						a1f234be11 
					 
					
						
						
							
							make the ordering of the return type and av_cold consistent  
						
						... 
						
						
						
						Signed-off-by: Michael Niedermayer <michaelni@gmx.at > 
						
						
					 
					
						2013-05-05 13:13:00 +02:00 
						 
				 
			
				
					
						
							
							
								James Zern 
							
						 
					 
					
						
						
							
						
						1811f1d840 
					 
					
						
						
							
							libopusenc: use ff_alloc_packet2  
						
						... 
						
						
						
						Signed-off-by: Paul B Mahol <onemda@gmail.com > 
						
						
					 
					
						2013-03-06 10:31:56 +00:00 
						 
				 
			
				
					
						
							
							
								Nicolas George 
							
						 
					 
					
						
						
							
						
						13811b19d6 
					 
					
						
						
							
							lavc/libopusenc: report an error if global_quality is set.  
						
						
						
						
					 
					
						2013-02-27 19:01:34 +01:00 
						 
				 
			
				
					
						
							
							
								Michael Niedermayer 
							
						 
					 
					
						
						
							
						
						f5b31daa5e 
					 
					
						
						
							
							libopusenc: use more specific and correct name for the channel order  
						
						... 
						
						
						
						Signed-off-by: Michael Niedermayer <michaelni@gmx.at > 
						
						
					 
					
						2012-10-02 17:34:10 +02:00 
						 
				 
			
				
					
						
							
							
								Michael Niedermayer 
							
						 
					 
					
						
						
							
						
						82db8ee321 
					 
					
						
						
							
							Merge commit 'fd41cb43702498948ff14ba8c284fd5c15fc729d'  
						
						... 
						
						
						
						* commit 'fd41cb43702498948ff14ba8c284fd5c15fc729d':
  avconv: improve sample format negotiation for decoder request
  Opus encoder using libopus
  mpegts: Drop pointless casting of hex_dump_debug arguments
  avformat: const correctness for av_hex_dump / av_hex_dump_log
  wmadec: Adjust debug printf argument length modifier
Conflicts:
	Changelog
	ffmpeg.c
	libavcodec/libopusdec.c
	libavcodec/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at > 
						
						
					 
					
						2012-10-02 14:58:19 +02:00 
						 
				 
			
				
					
						
							
							
								Nathan Caldwell 
							
						 
					 
					
						
						
							
						
						6cb8c85409 
					 
					
						
						
							
							Opus encoder using libopus  
						
						... 
						
						
						
						Signed-off-by: Diego Biurrun <diego@biurrun.de > 
						
						
					 
					
						2012-10-01 14:42:40 +02:00