breeze/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2026-02-04 14:30:55 +08:00
Code Issues Packages Projects Releases Wiki Activity
Files
9e04e11e83cdb61dfdeeaaa0c8e56073e306fe74
FFmpeg/libavcodec/asvdec.c
Michael Niedermayer 8e09e183fc Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  8bps: cosmetics
  aasc: cosmetics, reformat
  ansi: remove an extra return
  asvdec: cosmetics, reformat
  aura: cosmetics, reformat

Conflicts:
	libavcodec/aasc.c
	libavcodec/asvdec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-12-23 15:03:15 +01:00

10 KiB
Raw Blame History

View Raw
Reference in New Issue View Git Blame Copy Permalink