Commit Graph

2 Commits

Author SHA1 Message Date
Himangi Saraogi
df4fca2163 vda: Cast to not discard constant qualifier and silence compiler warning
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-04-09 01:23:33 +02:00
Michael Niedermayer
5460ab73d2 Merge commit '1839fafa951308237c4672ffd9a94f927b26eac7'
* commit '1839fafa951308237c4672ffd9a94f927b26eac7':
  avconv: Support VDA hwaccel

Conflicts:
	Makefile

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-05-12 02:44:28 +02:00