github.com/FFmpeg/FFmpeg.git - Unnamed repository; edit this file 'description' to name the repository.

Age	Commit message (Collapse)	Author
2013-08-30	Reinstate proper FFmpeg license for all files.	Thilo Borgmann

2013-08-03	Merge commit '79be2c325c5ee8f7ac9e28399e51986ebe99bb3c'	Michael Niedermayer
	* commit '79be2c325c5ee8f7ac9e28399e51986ebe99bb3c': doc/print_options: Move options headers to a saner place Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-08-03	Merge commit 'b5a138652ff8a5b987d3e1191e67fd9f6575527e'	Michael Niedermayer
	* commit 'b5a138652ff8a5b987d3e1191e67fd9f6575527e': Give less generic names to global library option arrays Conflicts: libavcodec/options_table.h libavfilter/avfilter.c libavformat/options_table.h libswscale/options.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-08-02	doc/print_options: Move options headers to a saner place	Diego Biurrun

2013-08-02	Give less generic names to global library option arrays	Diego Biurrun

2013-03-18	Merge remote-tracking branch 'qatar/master'	Michael Niedermayer
	* qatar/master: print_options: do not generate docs for options without enc or dec flags mpeg12: do not fail on zero dimensions in the sequence header. Conflicts: libavcodec/mpeg12.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-03-18	print_options: do not generate docs for options without enc or dec flags	Anton Khirnov
	Those are not usable from the avtools, so mentioning them in the manpages just confuses the reader.
2012-04-23	print_options: warn that the files are generated.	Nicolas George

2012-03-20	Generate manpages for AV{Format,Codec}Context AVOptions.	Anton Khirnov