eessppeelllloo/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2026-06-01 13:16:43 +02:00
Code Issues Packages Projects Releases Wiki Activity
Files
82e4340f1ef0dba67ca9e264a400aec895293dfe
ffmpeg/libavcodec/dnxhd_parser.c
T
Michael Niedermayer bad101ab8a Merge commit '89ef08c992c484a46711b1a68a988303679c288e' 
* commit '89ef08c992c484a46711b1a68a988303679c288e':
  DNxHD: K&R formatting cosmetics

Conflicts:
	libavcodec/dnxhd_parser.c
	libavcodec/dnxhddec.c
	libavcodec/dnxhdenc.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-04-11 14:04:10 +02:00

3.6 KiB
Raw Blame History

View Raw
Reference in New Issue View Git Blame Copy Permalink