Michael Niedermayer 17ebef2fc8 Merge commit '2c328a907978b61949fd20f7c991803174337855'
* commit '2c328a907978b61949fd20f7c991803174337855':
  pixdesc: add a function for counting planes in a pixel format.
  avplay: remove the -debug option.
  Revert "asfenc: return error on negative timestamp"

Conflicts:
	doc/APIchanges
	doc/ffplay.texi
	ffplay.c
	libavutil/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-03-20 11:24:11 +01:00
..
2012-10-08 11:22:42 +02:00
2012-01-28 11:04:19 +01:00
2013-03-17 03:43:36 +01:00
2013-01-21 10:24:45 +00:00
2013-01-06 16:30:02 +01:00
2013-02-13 18:41:37 -05:00
2012-12-21 00:18:34 +01:00
2013-01-06 16:30:02 +01:00
2013-02-14 23:45:48 +01:00
2012-12-21 00:18:34 +01:00