ffmpeg/libavutil
Michael Niedermayer d0ac26a264 Merge commit 'c692957c4edd119920cd7f2121628dd183589e6a'
* commit 'c692957c4edd119920cd7f2121628dd183589e6a':
  lavu: remove disabled avoptions cruft
  lavu: remove disabled FF_API_GET_BITS_PER_SAMPLE_FMT cruft

Conflicts:
	libavutil/opt.c
	libavutil/opt.h
	libavutil/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-10-23 14:50:31 +02:00
..
2012-07-11 04:04:29 +02:00
2012-07-16 19:30:13 +00:00
2012-04-20 09:43:11 -04:00
2012-01-22 23:06:04 +01:00
2012-09-15 19:47:10 -04:00
2012-10-01 16:41:37 +02:00
2012-05-15 18:08:32 +02:00
2012-10-11 17:09:57 +02:00
2012-08-09 01:44:15 +02:00
2012-07-07 01:41:55 +00:00
2012-10-23 07:33:05 +02:00
2012-10-23 07:33:05 +02:00
2012-10-06 14:03:15 +02:00
2012-10-08 03:44:18 +02:00