apps/ffmpeg-rockchip
1
0
Fork 0
mirror of https://github.com/nyanmisaka/ffmpeg-rockchip.git synced 2025-10-07 17:51:52 +08:00
Code Issues Packages Projects Releases Wiki Activity
47,469 Commits 6 Branches 0 Tags
2f980cf39a14f90b9356b51ef1ed6e7816f6aac3
Commit Graph

4 Commits

Author SHA1 Message Date
Michael Niedermayer
ca1f2b3e10 Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  cmutils: include shellapi.h on Win32 (for CommandLineToArgvW).
  x86/timer: implement an intrinsic-based version for rdtsc (AV_READ_TIME).
  id3v2: add a mimetype for bmp pictures.
  flacdec: be less strict when parsing attached pictures.
  flacdec: don't create an attached picture stream until we have all information.

Conflicts:
	configure

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2012-07-08 22:33:32 +02:00
Ronald S. Bultje
07b287020c x86/timer: implement an intrinsic-based version for rdtsc (AV_READ_TIME). 2012-07-07 13:35:07 -07:00
Mans Rullgard
2912e87a6c Replace FFmpeg with Libav in licence headers 
Signed-off-by: Mans Rullgard <mans@mansr.com>
 2011-03-19 13:33:20 +00:00
Måns Rullgård
439ccc4e0e Split libavutil/timer.h per architecture 
Originally committed as revision 18304 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-04-01 22:56:22 +00:00