Michael Niedermayer 
							
						 
					 
					
						
						
						
						
							
						
						
							e5c28d4f9a 
							
						 
					 
					
						
						
							
							Merge commit '3a70c0c95feacb3844d05eebd579fc8189a77eee'  
						
						... 
						
						
						
						* commit '3a70c0c95feacb3844d05eebd579fc8189a77eee':
  examples/transcode_aac: generate proper PTS and set the muxer timebase
Merged-by: Michael Niedermayer <michaelni@gmx.at> 
						
						
					 
					
						2015-01-27 13:35:31 +01:00 
						 
				 
			
				
					
						
							
							
								Michael Niedermayer 
							
						 
					 
					
						
						
						
						
							
						
						
							d078d57fb7 
							
						 
					 
					
						
						
							
							Merge commit 'c9b19ac8928c6c9b7f25c3988177204f110d5e0e'  
						
						... 
						
						
						
						* commit 'c9b19ac8928c6c9b7f25c3988177204f110d5e0e':
  examples/transcode_aac: fix a typo
Merged-by: Michael Niedermayer <michaelni@gmx.at> 
						
						
					 
					
						2015-01-27 13:29:46 +01:00 
						 
				 
			
				
					
						
							
							
								Michael Niedermayer 
							
						 
					 
					
						
						
						
						
							
						
						
							010311d673 
							
						 
					 
					
						
						
							
							Merge commit '749a89d1b8bb73b4d4f14c48f33259a1300c1761'  
						
						... 
						
						
						
						* commit '749a89d1b8bb73b4d4f14c48f33259a1300c1761':
  examples/transcode_aac: properly select the output sample format
Merged-by: Michael Niedermayer <michaelni@gmx.at> 
						
						
					 
					
						2015-01-27 13:21:02 +01:00 
						 
				 
			
				
					
						
							
							
								Andreas Unterweger 
							
						 
					 
					
						
						
						
						
							
						
						
							3a70c0c95f 
							
						 
					 
					
						
						
							
							examples/transcode_aac: generate proper PTS and set the muxer timebase  
						
						... 
						
						
						
						Signed-off-by: Anton Khirnov <anton@khirnov.net> 
						
						
					 
					
						2015-01-27 09:03:08 +01:00 
						 
				 
			
				
					
						
							
							
								Andreas Unterweger 
							
						 
					 
					
						
						
						
						
							
						
						
							c9b19ac892 
							
						 
					 
					
						
						
							
							examples/transcode_aac: fix a typo  
						
						... 
						
						
						
						Signed-off-by: Anton Khirnov <anton@khirnov.net> 
						
						
					 
					
						2015-01-27 09:00:23 +01:00 
						 
				 
			
				
					
						
							
							
								Andreas Unterweger 
							
						 
					 
					
						
						
						
						
							
						
						
							749a89d1b8 
							
						 
					 
					
						
						
							
							examples/transcode_aac: properly select the output sample format  
						
						... 
						
						
						
						Makes the example work with all the supported AAC encoders.
Signed-off-by: Anton Khirnov <anton@khirnov.net> 
						
						
					 
					
						2015-01-27 08:58:47 +01:00 
						 
				 
			
				
					
						
							
							
								Michael Niedermayer 
							
						 
					 
					
						
						
						
						
							
						
						
							c61b84ccfd 
							
						 
					 
					
						
						
							
							doc/examples/transcode_aac: Use avio_closep() in examples as it avoids leaving stale pointers  
						
						... 
						
						
						
						Signed-off-by: Michael Niedermayer <michaelni@gmx.at> 
						
						
					 
					
						2015-01-08 05:28:51 +01:00 
						 
				 
			
				
					
						
							
							
								Michael Niedermayer 
							
						 
					 
					
						
						
						
						
							
						
						
							230aeee94c 
							
						 
					 
					
						
						
							
							doc: fix the the typos  
						
						... 
						
						
						
						Signed-off-by: Michael Niedermayer <michaelni@gmx.at> 
						
						
					 
					
						2014-11-22 02:09:09 +01:00 
						 
				 
			
				
					
						
							
							
								Timothy Gu 
							
						 
					 
					
						
						
						
						
							
						
						
							9f02a2b224 
							
						 
					 
					
						
						
							
							transcode_aac: fix const return value  
						
						... 
						
						
						
						Fixes Trac #3613 .
Signed-off-by: Timothy Gu <timothygu99@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at> 
						
						
					 
					
						2014-08-06 04:01:19 +02:00 
						 
				 
			
				
					
						
							
							
								Michael Niedermayer 
							
						 
					 
					
						
						
						
						
							
						
						
							1fc74926a5 
							
						 
					 
					
						
						
							
							Merge commit 'b339182eba34f28de5f1a477cdd2c84f1ef35d90'  
						
						... 
						
						
						
						* commit 'b339182eba34f28de5f1a477cdd2c84f1ef35d90':
  Move all example programs to doc/examples
Conflicts:
	configure
	doc/Makefile
	doc/doxy-wrapper.sh
	doc/examples/avcodec.c
	doc/examples/decoding_encoding.c
	doc/examples/metadata.c
	doc/examples/muxing.c
	doc/examples/transcode_aac.c
	libavcodec/Makefile
	libavcodec/api-example.c
	libavformat/Makefile
Merged-by: Michael Niedermayer <michaelni@gmx.at> 
						
						
					 
					
						2014-02-17 02:22:01 +01:00 
						 
				 
			
				
					
						
							
							
								Diego Biurrun 
							
						 
					 
					
						
						
						
						
							
						
						
							b339182eba 
							
						 
					 
					
						
						
							
							Move all example programs to doc/examples  
						
						... 
						
						
						
						Also drop support for building examples in library directories. 
						
						
					 
					
						2014-02-16 21:37:21 +01:00 
						 
				 
			
				
					
						
							
							
								Michael Niedermayer 
							
						 
					 
					
						
						
						
						
							
						
						
							fba1592f35 
							
						 
					 
					
						
						
							
							Merge remote-tracking branch 'qatar/master'  
						
						... 
						
						
						
						* qatar/master:
  doc/examples: misc Doxygen markup improvements
Conflicts:
	doc/examples/muxing.c
	doc/examples/transcode_aac.c
Merged-by: Michael Niedermayer <michaelni@gmx.at> 
						
						
					 
					
						2014-02-14 15:31:14 +01:00 
						 
				 
			
				
					
						
							
							
								Diego Biurrun 
							
						 
					 
					
						
						
						
						
							
						
						
							0b9716c455 
							
						 
					 
					
						
						
							
							doc/examples: misc Doxygen markup improvements  
						
						... 
						
						
						
						Add properly formatted @example tag and fix Doxygen syntax. 
						
						
					 
					
						2014-02-14 12:01:36 +01:00 
						 
				 
			
				
					
						
							
							
								Michael Niedermayer 
							
						 
					 
					
						
						
						
						
							
						
						
							ba728c1a25 
							
						 
					 
					
						
						
							
							doc/examples/transcode_aac: remove non converted codepath  
						
						... 
						
						
						
						This codepath is not implemented and just crashes, also its simpler
without special cases, which makes sense for an example
Signed-off-by: Michael Niedermayer <michaelni@gmx.at> 
						
						
					 
					
						2013-11-27 11:22:19 +01:00 
						 
				 
			
				
					
						
							
							
								Michael Niedermayer 
							
						 
					 
					
						
						
						
						
							
						
						
							7497c894cd 
							
						 
					 
					
						
						
							
							doc/examples/transcode_aac: switch to swresample  
						
						... 
						
						
						
						Signed-off-by: Michael Niedermayer <michaelni@gmx.at> 
						
						
					 
					
						2013-11-27 11:15:48 +01:00 
						 
				 
			
				
					
						
							
							
								Michael Niedermayer 
							
						 
					 
					
						
						
						
						
							
						
						
							02abc905cd 
							
						 
					 
					
						
						
							
							doc/examples/transcode_aac: fix project name  
						
						... 
						
						
						
						Signed-off-by: Michael Niedermayer <michaelni@gmx.at> 
						
						
					 
					
						2013-11-27 10:52:05 +01:00 
						 
				 
			
				
					
						
							
							
								Michael Niedermayer 
							
						 
					 
					
						
						
						
						
							
						
						
							715f3623f8 
							
						 
					 
					
						
						
							
							Merge remote-tracking branch 'qatar/master'  
						
						... 
						
						
						
						* qatar/master:
  Add an audio transcoding example.
Conflicts:
	configure
	doc/Makefile
Merged-by: Michael Niedermayer <michaelni@gmx.at> 
						
						
					 
					
						2013-11-27 10:31:08 +01:00 
						 
				 
			
				
					
						
							
							
								Andreas Unterweger 
							
						 
					 
					
						
						
						
						
							
						
						
							10421bcf0a 
							
						 
					 
					
						
						
							
							Add an audio transcoding example.  
						
						... 
						
						
						
						Signed-off-by: Anton Khirnov <anton@khirnov.net> 
						
						
					 
					
						2013-11-27 09:20:05 +01:00