1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-02-04 06:08:26 +02:00
FFmpeg/libavcodec
Michael Niedermayer a8e963835a Merge commit 'b5a138652ff8a5b987d3e1191e67fd9f6575527e'
* 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-03 09:16:36 +02:00
..
2013-07-13 16:23:31 +02:00
2013-07-19 17:42:34 +02:00
2013-07-27 20:51:14 +00:00
2013-07-27 20:45:48 +00:00
2013-07-27 12:02:19 +00:00
2013-07-29 20:58:20 +02:00
2013-07-31 20:01:43 +00:00
2013-07-30 21:12:34 +00:00
2013-08-02 03:21:09 +02:00
2013-07-28 22:27:36 +00:00
2013-07-26 14:00:40 +00:00
2013-07-28 22:27:36 +00:00
2013-07-28 22:27:36 +00:00
2013-07-28 22:27:36 +00:00
2013-07-26 18:21:44 +00:00
2013-07-27 12:02:18 +00:00
2013-08-02 16:45:58 +00:00
2013-07-29 14:45:02 +00:00