Clément Bœsch 
							
						 
					 
					
						
						
						
						
							
						
						
							126e96533f 
							
						 
					 
					
						
						
							
							Merge commit '9833a406d3d743d238e4cbee08ffcaa12e067dd2'  
						
						... 
						
						
						
						* commit '9833a406d3d743d238e4cbee08ffcaa12e067dd2':
  examples: Properly free AVCodecContext
Merged-by: Clément Bœsch <cboesch@gopro.com> 
						
						
					 
					
						2017-01-31 17:35:41 +01:00 
						 
				 
			
				
					
						
							
							
								Rostislav Pehlivanov 
							
						 
					 
					
						
						
						
						
							
						
						
							e05d2dd86a 
							
						 
					 
					
						
						
							
							doc/examples/decoder_targeted: move to tools/target_dec_fuzzer.c  
						
						... 
						
						
						
						Name and purpose are more appropriate there since the code isn't
an ideal example.
Reviewed-by: wm4 <nfxjfg@googlemail.com>
Signed-off-by: Rostislav Pehlivanov <atomnuker@gmail.com> 
						
						
					 
					
						2017-01-29 16:14:18 +00:00 
						 
				 
			
				
					
						
							
							
								Michael Niedermayer 
							
						 
					 
					
						
						
						
						
							
						
						
							bbd4d92304 
							
						 
					 
					
						
						
							
							doc/examples/decoder_targeted: Disable error concealment after 20 frames  
						
						... 
						
						
						
						This allows testing EC and non EC. Avoids spending most time in EC on
high res samples and reduces the likelyhood of hitting timeouts
Fixes: Timeout in 467/fuzz-2-ffmpeg_VIDEO_AV_CODEC_ID_H263_fuzzer
Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/targets/ffmpeg 
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc> 
						
						
					 
					
						2017-01-29 16:09:55 +01:00 
						 
				 
			
				
					
						
							
							
								Michael Niedermayer 
							
						 
					 
					
						
						
						
						
							
						
						
							89d4d7d759 
							
						 
					 
					
						
						
							
							doc/examples/http_multiclient: Fix resource leak  
						
						... 
						
						
						
						Fixes CID1396269
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc> 
						
						
					 
					
						2016-12-26 18:29:00 +01:00 
						 
				 
			
				
					
						
							
							
								Michael Niedermayer 
							
						 
					 
					
						
						
						
						
							
						
						
							99af260d0b 
							
						 
					 
					
						
						
							
							doc/examples/decoder_targeted: Limit max pixels for fuzzing  
						
						... 
						
						
						
						Signed-off-by: Michael Niedermayer <michael@niedermayer.cc> 
						
						
					 
					
						2016-12-19 19:59:06 +01:00 
						 
				 
			
				
					
						
							
							
								Александр Слободенюк 
							
						 
					 
					
						
						
						
						
							
						
						
							3aa1ff30f3 
							
						 
					 
					
						
						
							
							doc/examples/transcode_aac: fix a typo  
						
						... 
						
						
						
						Signed-off-by: Michael Niedermayer <michael@niedermayer.cc> 
						
						
					 
					
						2016-12-01 12:53:45 +01:00 
						 
				 
			
				
					
						
							
							
								Sam Hocevar 
							
						 
					 
					
						
						
						
						
							
						
						
							3115550abe 
							
						 
					 
					
						
						
							
							doc/examples/muxing: Fix av_frame_make_writable usage  
						
						... 
						
						
						
						This patch moves the av_frame_make_writable() call from fill_yuv_image
to get_video_frame so that its argument can be the actual frame that
will be sent to the encoder.
This fixes data corruption issues in codecs that keep references on
one or several previous frames.
Signed-off-by: Sam Hocevar <sam@hocevar.net>
Reviewed-by: wm4
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc> 
						
						
					 
					
						2016-11-23 03:28:04 +01:00 
						 
				 
			
				
					
						
							
							
								Thomas Garnier 
							
						 
					 
					
						
						
						
						
							
						
						
							c06d923410 
							
						 
					 
					
						
						
							
							doc/examples: add fuzz target for individual ffmpeg APIs for in-process fuzzing with libFuzzer, AFL, and similar fuzzing engines.  
						
						... 
						
						
						
						Signed-off-by: Michael Niedermayer <michael@niedermayer.cc> 
						
						
					 
					
						2016-11-04 22:42:20 +01:00 
						 
				 
			
				
					
						
							
							
								Michael Niedermayer 
							
						 
					 
					
						
						
						
						
							
						
						
							2bd9956454 
							
						 
					 
					
						
						
							
							doc/examples/demuxing_decoding: Drop AVFrame->pts use  
						
						... 
						
						
						
						This code is not correct for git master
Reviewed-by: Stefano Sabatini <stefasab@gmail.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc> 
						
						
					 
					
						2016-10-18 15:15:12 +02:00 
						 
				 
			
				
					
						
							
							
								Michael Niedermayer 
							
						 
					 
					
						
						
						
						
							
						
						
							7ba7b96dd3 
							
						 
					 
					
						
						
							
							doc/examples/http_multiclient: Fix "doc/examples/http_multiclient.c:43:9: warning: passing argument 4 of av_opt_get from incompatible pointer type"  
						
						... 
						
						
						
						Signed-off-by: Michael Niedermayer <michael@niedermayer.cc> 
						
						
					 
					
						2016-10-09 00:32:39 +02:00 
						 
				 
			
				
					
						
							
							
								Clément Bœsch 
							
						 
					 
					
						
						
						
						
							
						
						
							1a9b4bc4c7 
							
						 
					 
					
						
						
							
							doc/examples: build http_multiclient example  
						
						
						
						
					 
					
						2016-09-30 19:35:52 +02:00 
						 
				 
			
				
					
						
							
							
								Clément Bœsch 
							
						 
					 
					
						
						
						
						
							
						
						
							1e647d200f 
							
						 
					 
					
						
						
							
							doc/examples/gitignore: add forgotten qsvdec entry  
						
						
						
						
					 
					
						2016-09-30 19:35:52 +02:00 
						 
				 
			
				
					
						
							
							
								Clément Bœsch 
							
						 
					 
					
						
						
						
						
							
						
						
							f2579f7ee2 
							
						 
					 
					
						
						
							
							doc/examples/http_multiclient: fix mixed declarations and code  
						
						
						
						
					 
					
						2016-09-30 19:35:52 +02:00 
						 
				 
			
				
					
						
							
							
								Clément Bœsch 
							
						 
					 
					
						
						
						
						
							
						
						
							fb5e58cd77 
							
						 
					 
					
						
						
							
							doc/examples/http_multiclient: fix compilation  
						
						... 
						
						
						
						Fixes error: no previous prototype for ‘process_client’ [-Werror=missing-prototypes] 
						
						
					 
					
						2016-09-30 19:35:52 +02:00 
						 
				 
			
				
					
						
							
							
								James Almer 
							
						 
					 
					
						
						
						
						
							
						
						
							bba6a03b28 
							
						 
					 
					
						
						
							
							examples/demuxing_decoding: convert to codecpar  
						
						... 
						
						
						
						Signed-off-by: James Almer <jamrial@gmail.com> 
						
						
					 
					
						2016-08-17 19:17:04 -03:00 
						 
				 
			
				
					
						
							
							
								Vittorio Giovara 
							
						 
					 
					
						
						
						
						
							
						
						
							9833a406d3 
							
						 
					 
					
						
						
							
							examples: Properly free AVCodecContext  
						
						
						
						
					 
					
						2016-07-20 17:13:53 +02:00 
						 
				 
			
				
					
						
							
							
								Clément Bœsch 
							
						 
					 
					
						
						
						
						
							
						
						
							5558ff3a9f 
							
						 
					 
					
						
						
							
							Merge commit '257f00ec1ab06a2a161f535036c6512f3fc8e801'  
						
						... 
						
						
						
						* commit '257f00ec1ab06a2a161f535036c6512f3fc8e801':
  Split global .gitignore file into per-directory files
Merged-by: Clément Bœsch <clement@stupeflix.com> 
						
						
					 
					
						2016-06-22 11:28:51 +02:00 
						 
				 
			
				
					
						
							
							
								Clément Bœsch 
							
						 
					 
					
						
						
						
						
							
						
						
							8ef57a0d61 
							
						 
					 
					
						
						
							
							Merge commit '41ed7ab45fc693f7d7fc35664c0233f4c32d69bb'  
						
						... 
						
						
						
						* commit '41ed7ab45fc693f7d7fc35664c0233f4c32d69bb':
  cosmetics: Fix spelling mistakes
Merged-by: Clément Bœsch <u@pkh.me> 
						
						
					 
					
						2016-06-21 21:55:34 +02:00 
						 
				 
			
				
					
						
							
							
								Michael Niedermayer 
							
						 
					 
					
						
						
						
						
							
						
						
							3bc060f366 
							
						 
					 
					
						
						
							
							doc/examples/transcoding: Use the decoders pixel format if the encoder does not list which are supported  
						
						... 
						
						
						
						This affects rawvideo and wraped_avframe, no others are affected atm
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc> 
						
						
					 
					
						2016-06-05 17:10:15 +02:00 
						 
				 
			
				
					
						
							
							
								Diego Biurrun 
							
						 
					 
					
						
						
						
						
							
						
						
							257f00ec1a 
							
						 
					 
					
						
						
							
							Split global .gitignore file into per-directory files  
						
						
						
						
					 
					
						2016-05-13 14:55:56 +02:00 
						 
				 
			
				
					
						
							
							
								Vittorio Giovara 
							
						 
					 
					
						
						
						
						
							
						
						
							41ed7ab45f 
							
						 
					 
					
						
						
							
							cosmetics: Fix spelling mistakes  
						
						... 
						
						
						
						Signed-off-by: Diego Biurrun <diego@biurrun.de> 
						
						
					 
					
						2016-05-04 18:16:21 +02:00 
						 
				 
			
				
					
						
							
							
								Michael Niedermayer 
							
						 
					 
					
						
						
						
						
							
						
						
							0c79c96cf2 
							
						 
					 
					
						
						
							
							doc/examples/muxing: Add support to pass flags to muxer as since codecpar the codec flags are not available to the muxer anymore  
						
						... 
						
						
						
						Signed-off-by: Michael Niedermayer <michael@niedermayer.cc> 
						
						
					 
					
						2016-04-11 17:57:06 +02:00 
						 
				 
			
				
					
						
							
							
								Derek Buitenhuis 
							
						 
					 
					
						
						
						
						
							
						
						
							6bc5ef37cb 
							
						 
					 
					
						
						
							
							Merge commit 'ac6d53589f3631ae08467c784fb371a15c957f01'  
						
						... 
						
						
						
						* commit 'ac6d53589f3631ae08467c784fb371a15c957f01':
  examples/transcode_aac: convert to codecpar
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com> 
						
						
					 
					
						2016-04-11 14:15:28 +01:00 
						 
				 
			
				
					
						
							
							
								Derek Buitenhuis 
							
						 
					 
					
						
						
						
						
							
						
						
							030e69b4dc 
							
						 
					 
					
						
						
							
							Merge commit 'a9e1f2cc61cbd5606a087a60565e87923c39de5a'  
						
						... 
						
						
						
						* commit 'a9e1f2cc61cbd5606a087a60565e87923c39de5a':
  examples/qsvdec: convert to codecpar
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com> 
						
						
					 
					
						2016-04-11 14:07:41 +01:00 
						 
				 
			
				
					
						
							
							
								Derek Buitenhuis 
							
						 
					 
					
						
						
						
						
							
						
						
							d76972b581 
							
						 
					 
					
						
						
							
							Merge commit '9897d9f4e074cdc6c7f2409885ddefe300f18dc7'  
						
						... 
						
						
						
						* commit '9897d9f4e074cdc6c7f2409885ddefe300f18dc7':
  examples/output: convert to codecpar
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com> 
						
						
					 
					
						2016-04-11 14:06:43 +01:00 
						 
				 
			
				
					
						
							
							
								Lou Logan 
							
						 
					 
					
						
						
						
						
							
						
						
							06eef96b69 
							
						 
					 
					
						
						
							
							fix some a/an typos  
						
						... 
						
						
						
						Signed-off-by: Lou Logan <lou@lrcd.com> 
						
						
					 
					
						2016-03-28 14:13:17 -08:00 
						 
				 
			
				
					
						
							
							
								Anton Khirnov 
							
						 
					 
					
						
						
						
						
							
						
						
							ac6d53589f 
							
						 
					 
					
						
						
							
							examples/transcode_aac: convert to codecpar  
						
						
						
						
					 
					
						2016-02-24 10:08:34 +01:00 
						 
				 
			
				
					
						
							
							
								Anton Khirnov 
							
						 
					 
					
						
						
						
						
							
						
						
							a9e1f2cc61 
							
						 
					 
					
						
						
							
							examples/qsvdec: convert to codecpar  
						
						
						
						
					 
					
						2016-02-24 10:08:30 +01:00 
						 
				 
			
				
					
						
							
							
								Anton Khirnov 
							
						 
					 
					
						
						
						
						
							
						
						
							9897d9f4e0 
							
						 
					 
					
						
						
							
							examples/output: convert to codecpar  
						
						
						
						
					 
					
						2016-02-24 10:08:24 +01:00 
						 
				 
			
				
					
						
							
							
								Hendrik Leppkes 
							
						 
					 
					
						
						
						
						
							
						
						
							c2f861ca42 
							
						 
					 
					
						
						
							
							Replace remaining occurances of av_free_packet with av_packet_unref  
						
						
						
						
					 
					
						2015-10-27 14:35:30 +01:00 
						 
				 
			
				
					
						
							
							
								Hendrik Leppkes 
							
						 
					 
					
						
						
						
						
							
						
						
							7f5af80ba4 
							
						 
					 
					
						
						
							
							Merge commit 'ce70f28a1732c74a9cd7fec2d56178750bd6e457'  
						
						... 
						
						
						
						* commit 'ce70f28a1732c74a9cd7fec2d56178750bd6e457':
  avpacket: Replace av_free_packet with av_packet_unref
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com> 
						
						
					 
					
						2015-10-27 14:28:56 +01:00 
						 
				 
			
				
					
						
							
							
								Luca Barbato 
							
						 
					 
					
						
						
						
						
							
						
						
							ce70f28a17 
							
						 
					 
					
						
						
							
							avpacket: Replace av_free_packet with av_packet_unref  
						
						... 
						
						
						
						`av_packet_unref` matches the AVFrame ref-counted API and can be used as
a drop in replacement.
Deprecate `av_free_packet`. 
						
						
					 
					
						2015-10-26 18:00:55 +01:00 
						 
				 
			
				
					
						
							
							
								Michael Niedermayer 
							
						 
					 
					
						
						
						
						
							
						
						
							83fc0b9d48 
							
						 
					 
					
						
						
							
							doc/examples/muxing: Fix mixed declaration and code  
						
						... 
						
						
						
						Signed-off-by: Michael Niedermayer <michael@niedermayer.cc> 
						
						
					 
					
						2015-10-15 00:24:00 +02:00 
						 
				 
			
				
					
						
							
							
								Hendrik Leppkes 
							
						 
					 
					
						
						
						
						
							
						
						
							1899b25799 
							
						 
					 
					
						
						
							
							Merge commit '34ed5c2e4d9b7fe5c9b3aae2da5599fabb95c02e'  
						
						... 
						
						
						
						* commit '34ed5c2e4d9b7fe5c9b3aae2da5599fabb95c02e':
  avformat: Do not use AVFMT_RAWPICTURE
Removal from ffmpeg.c not merged because some parts of avdevice
still use it
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com> 
						
						
					 
					
						2015-10-14 14:43:20 +02:00 
						 
				 
			
				
					
						
							
							
								Luca Barbato 
							
						 
					 
					
						
						
						
						
							
						
						
							34ed5c2e4d 
							
						 
					 
					
						
						
							
							avformat: Do not use AVFMT_RAWPICTURE  
						
						... 
						
						
						
						There are no formats supporting it anymore and it is deprecated.
Update the documentation accordingly. 
						
						
					 
					
						2015-10-13 13:43:29 +02:00 
						 
				 
			
				
					
						
							
							
								Hendrik Leppkes 
							
						 
					 
					
						
						
						
						
							
						
						
							b1284a4b4a 
							
						 
					 
					
						
						
							
							Merge commit '539e5ac2ecfec2e2f441222a43fb0583643ea607'  
						
						... 
						
						
						
						* commit '539e5ac2ecfec2e2f441222a43fb0583643ea607':
  examples/qsvdec: free the lavc decoder before closing MFX/VAAPI
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com> 
						
						
					 
					
						2015-09-29 14:17:29 +02:00 
						 
				 
			
				
					
						
							
							
								Hendrik Leppkes 
							
						 
					 
					
						
						
						
						
							
						
						
							d0a1605134 
							
						 
					 
					
						
						
							
							Merge commit '3ee462dca1038e63b8e8d5e751121736d5772a5d'  
						
						... 
						
						
						
						* commit '3ee462dca1038e63b8e8d5e751121736d5772a5d':
  examples/qsvdec: do not free the surfaces in the frame_free() callback
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com> 
						
						
					 
					
						2015-09-29 14:17:23 +02:00 
						 
				 
			
				
					
						
							
							
								Anton Khirnov 
							
						 
					 
					
						
						
						
						
							
						
						
							539e5ac2ec 
							
						 
					 
					
						
						
							
							examples/qsvdec: free the lavc decoder before closing MFX/VAAPI  
						
						... 
						
						
						
						lavc expects MFX to still be in a usable state on close. 
						
						
					 
					
						2015-09-28 15:46:10 +02:00 
						 
				 
			
				
					
						
							
							
								Anton Khirnov 
							
						 
					 
					
						
						
						
						
							
						
						
							3ee462dca1 
							
						 
					 
					
						
						
							
							examples/qsvdec: do not free the surfaces in the frame_free() callback  
						
						... 
						
						
						
						Even though libmfx might not need them anymore, avcodec might still
access the surfaces. So free them separately at the end. 
						
						
					 
					
						2015-09-28 15:45:29 +02:00 
						 
				 
			
				
					
						
							
							
								Clément Bœsch 
							
						 
					 
					
						
						
						
						
							
						
						
							d9464e9c14 
							
						 
					 
					
						
						
							
							doc/examples/demuxing_decoding: simplify api_mode to refcount  
						
						... 
						
						
						
						This finalizes the quick cleanup of a753e6c9f508fd48a0f34438bcdce87c826779b9. 
						
						
					 
					
						2015-09-06 12:35:00 +02:00 
						 
				 
			
				
					
						
							
							
								Michael Niedermayer 
							
						 
					 
					
						
						
						
						
							
						
						
							a753e6c9f5 
							
						 
					 
					
						
						
							
							doc/examples/demuxing_decoding: Drop old api mode, because the code fails to build otherwise  
						
						... 
						
						
						
						Signed-off-by: Michael Niedermayer <michael@niedermayer.cc> 
						
						
					 
					
						2015-09-05 18:25:24 +02:00 
						 
				 
			
				
					
						
							
							
								Hendrik Leppkes 
							
						 
					 
					
						
						
						
						
							
						
						
							144fb06806 
							
						 
					 
					
						
						
							
							Remove left-over FF_API_AVFILTERBUFFER cruft  
						
						
						
						
					 
					
						2015-09-05 16:27:19 +02:00 
						 
				 
			
				
					
						
							
							
								Michael Niedermayer 
							
						 
					 
					
						
						
						
						
							
						
						
							e9c58033e8 
							
						 
					 
					
						
						
							
							doc/examples/http_multiclient: Fix occured typo  
						
						... 
						
						
						
						Signed-off-by: Michael Niedermayer <michael@niedermayer.cc> 
						
						
					 
					
						2015-09-04 11:30:25 +02:00 
						 
				 
			
				
					
						
							
							
								Harshit Mittal 
							
						 
					 
					
						
						
						
						
							
						
						
							53bf32fa42 
							
						 
					 
					
						
						
							
							doc/examples/filtering_video: better demo ffmpeg filters; demos chaining the filters  
						
						... 
						
						
						
						Signed-off-by: Michael Niedermayer <michael@niedermayer.cc> 
						
						
					 
					
						2015-08-28 12:53:35 +02:00 
						 
				 
			
				
					
						
							
							
								Mariusz Szczepańczyk 
							
						 
					 
					
						
						
						
						
							
						
						
							767d780ec0 
							
						 
					 
					
						
						
							
							doc/examples: rename avio_list_dir -> avio_dir_cmd  
						
						... 
						
						
						
						Signed-off-by: Michael Niedermayer <michael@niedermayer.cc> 
						
						
					 
					
						2015-08-16 02:16:47 +02:00 
						 
				 
			
				
					
						
							
							
								Mariusz Szczepańczyk 
							
						 
					 
					
						
						
						
						
							
						
						
							c84d208c27 
							
						 
					 
					
						
						
							
							examples/avio_list_dir: add move and delete methods  
						
						... 
						
						
						
						Signed-off-by: Michael Niedermayer <michael@niedermayer.cc> 
						
						
					 
					
						2015-08-15 03:32:38 +02:00 
						 
				 
			
				
					
						
							
							
								Stephan Holljes 
							
						 
					 
					
						
						
						
						
							
						
						
							25410c524d 
							
						 
					 
					
						
						
							
							doc/example: Add http multi-client example code  
						
						... 
						
						
						
						Signed-off-by: Stephan Holljes <klaxa1337@googlemail.com> 
						
						
					 
					
						2015-08-01 00:58:32 +02:00 
						 
				 
			
				
					
						
							
							
								Michael Niedermayer 
							
						 
					 
					
						
						
						
						
							
						
						
							29d147c94d 
							
						 
					 
					
						
						
							
							Merge commit '059a934806d61f7af9ab3fd9f74994b838ea5eba'  
						
						... 
						
						
						
						* commit '059a934806d61f7af9ab3fd9f74994b838ea5eba':
  lavc: Consistently prefix input buffer defines
Conflicts:
	doc/examples/decoding_encoding.c
	libavcodec/4xm.c
	libavcodec/aac_adtstoasc_bsf.c
	libavcodec/aacdec.c
	libavcodec/aacenc.c
	libavcodec/ac3dec.h
	libavcodec/asvenc.c
	libavcodec/avcodec.h
	libavcodec/avpacket.c
	libavcodec/dvdec.c
	libavcodec/ffv1enc.c
	libavcodec/g2meet.c
	libavcodec/gif.c
	libavcodec/h264.c
	libavcodec/h264_mp4toannexb_bsf.c
	libavcodec/huffyuvdec.c
	libavcodec/huffyuvenc.c
	libavcodec/jpeglsenc.c
	libavcodec/libxvid.c
	libavcodec/mdec.c
	libavcodec/motionpixels.c
	libavcodec/mpeg4videodec.c
	libavcodec/mpegvideo.c
	libavcodec/noise_bsf.c
	libavcodec/nuv.c
	libavcodec/nvenc.c
	libavcodec/options.c
	libavcodec/parser.c
	libavcodec/pngenc.c
	libavcodec/proresenc_kostya.c
	libavcodec/qsvdec.c
	libavcodec/svq1enc.c
	libavcodec/tiffenc.c
	libavcodec/truemotion2.c
	libavcodec/utils.c
	libavcodec/utvideoenc.c
	libavcodec/vc1dec.c
	libavcodec/wmalosslessdec.c
	libavformat/adxdec.c
	libavformat/aiffdec.c
	libavformat/apc.c
	libavformat/apetag.c
	libavformat/avidec.c
	libavformat/bink.c
	libavformat/cafdec.c
	libavformat/flvdec.c
	libavformat/id3v2.c
	libavformat/isom.c
	libavformat/matroskadec.c
	libavformat/mov.c
	libavformat/mpc.c
	libavformat/mpc8.c
	libavformat/mpegts.c
	libavformat/mvi.c
	libavformat/mxfdec.c
	libavformat/mxg.c
	libavformat/nutdec.c
	libavformat/oggdec.c
	libavformat/oggparsecelt.c
	libavformat/oggparseflac.c
	libavformat/oggparseopus.c
	libavformat/oggparsespeex.c
	libavformat/omadec.c
	libavformat/rawdec.c
	libavformat/riffdec.c
	libavformat/rl2.c
	libavformat/rmdec.c
	libavformat/rtpdec_latm.c
	libavformat/rtpdec_mpeg4.c
	libavformat/rtpdec_qdm2.c
	libavformat/rtpdec_svq3.c
	libavformat/sierravmd.c
	libavformat/smacker.c
	libavformat/smush.c
	libavformat/spdifenc.c
	libavformat/takdec.c
	libavformat/tta.c
	libavformat/utils.c
	libavformat/vqf.c
	libavformat/westwood_vqa.c
	libavformat/xmv.c
	libavformat/xwma.c
	libavformat/yop.c
Merged-by: Michael Niedermayer <michael@niedermayer.cc> 
						
						
					 
					
						2015-07-27 23:15:19 +02:00 
						 
				 
			
				
					
						
							
							
								Michael Niedermayer 
							
						 
					 
					
						
						
						
						
							
						
						
							444e9874a7 
							
						 
					 
					
						
						
							
							Merge commit 'def97856de6021965db86c25a732d78689bd6bb0'  
						
						... 
						
						
						
						* commit 'def97856de6021965db86c25a732d78689bd6bb0':
  lavc: AV-prefix all codec capabilities
Conflicts:
	cmdutils.c
	ffmpeg.c
	ffplay.c
	libavcodec/8svx.c
	libavcodec/aacenc.c
	libavcodec/ac3dec.c
	libavcodec/adpcm.c
	libavcodec/alac.c
	libavcodec/atrac3plusdec.c
	libavcodec/bink.c
	libavcodec/dnxhddec.c
	libavcodec/dvdec.c
	libavcodec/dvenc.c
	libavcodec/ffv1dec.c
	libavcodec/ffv1enc.c
	libavcodec/fic.c
	libavcodec/flacdec.c
	libavcodec/flacenc.c
	libavcodec/flvdec.c
	libavcodec/fraps.c
	libavcodec/frwu.c
	libavcodec/gifdec.c
	libavcodec/h261dec.c
	libavcodec/hevc.c
	libavcodec/iff.c
	libavcodec/imc.c
	libavcodec/libopenjpegdec.c
	libavcodec/libvo-aacenc.c
	libavcodec/libvorbisenc.c
	libavcodec/libvpxdec.c
	libavcodec/libvpxenc.c
	libavcodec/libx264.c
	libavcodec/mjpegbdec.c
	libavcodec/mjpegdec.c
	libavcodec/mpegaudiodec_float.c
	libavcodec/msmpeg4dec.c
	libavcodec/mxpegdec.c
	libavcodec/nvenc_h264.c
	libavcodec/nvenc_hevc.c
	libavcodec/pngdec.c
	libavcodec/qpeg.c
	libavcodec/ra288.c
	libavcodec/rv10.c
	libavcodec/s302m.c
	libavcodec/sp5xdec.c
	libavcodec/takdec.c
	libavcodec/tiff.c
	libavcodec/tta.c
	libavcodec/utils.c
	libavcodec/v210dec.c
	libavcodec/vp6.c
	libavcodec/vp9.c
	libavcodec/wavpack.c
	libavcodec/yop.c
Merged-by: Michael Niedermayer <michael@niedermayer.cc> 
						
						
					 
					
						2015-07-27 22:50:18 +02:00 
						 
				 
			
				
					
						
							
							
								Michael Niedermayer 
							
						 
					 
					
						
						
						
						
							
						
						
							94d68a41fa 
							
						 
					 
					
						
						
							
							Merge commit '7c6eb0a1b7bf1aac7f033a7ec6d8cacc3b5c2615'  
						
						... 
						
						
						
						* commit '7c6eb0a1b7bf1aac7f033a7ec6d8cacc3b5c2615':
  lavc: AV-prefix all codec flags
Conflicts:
	doc/examples/muxing.c
	ffmpeg.c
	ffmpeg_opt.c
	ffplay.c
	libavcodec/aacdec.c
	libavcodec/aacenc.c
	libavcodec/ac3dec.c
	libavcodec/ac3enc_float.c
	libavcodec/atrac1.c
	libavcodec/atrac3.c
	libavcodec/atrac3plusdec.c
	libavcodec/dcadec.c
	libavcodec/ffv1enc.c
	libavcodec/h264.c
	libavcodec/h264_loopfilter.c
	libavcodec/h264_mb.c
	libavcodec/imc.c
	libavcodec/libmp3lame.c
	libavcodec/libtheoraenc.c
	libavcodec/libtwolame.c
	libavcodec/libvpxenc.c
	libavcodec/libxavs.c
	libavcodec/libxvid.c
	libavcodec/mpeg12dec.c
	libavcodec/mpeg12enc.c
	libavcodec/mpegaudiodec_template.c
	libavcodec/mpegvideo.c
	libavcodec/mpegvideo_enc.c
	libavcodec/mpegvideo_motion.c
	libavcodec/nellymoserdec.c
	libavcodec/nellymoserenc.c
	libavcodec/nvenc.c
	libavcodec/on2avc.c
	libavcodec/options_table.h
	libavcodec/opus_celt.c
	libavcodec/pngenc.c
	libavcodec/ra288.c
	libavcodec/ratecontrol.c
	libavcodec/twinvq.c
	libavcodec/vc1_block.c
	libavcodec/vc1_loopfilter.c
	libavcodec/vc1_mc.c
	libavcodec/vc1dec.c
	libavcodec/vorbisdec.c
	libavcodec/vp3.c
	libavcodec/wma.c
	libavcodec/wmaprodec.c
	libavcodec/x86/hpeldsp_init.c
	libavcodec/x86/me_cmp_init.c
Merged-by: Michael Niedermayer <michael@niedermayer.cc> 
						
						
					 
					
						2015-07-27 22:10:35 +02:00