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
ef21b3d38e61ba6730eb1d4573da65ca222b3619
FFmpeg/libavcodec/sunrast.c
Michael Niedermayer ffd100b111 Merge commit 'c265b8bb7638546919465e3585441b1d40c4b13d' 
* commit 'c265b8bb7638546919465e3585441b1d40c4b13d':
  tiff: stop using deprecated avcodec_set_dimensions
  targa: stop using deprecated avcodec_set_dimensions
  svq1dec: stop using deprecated avcodec_set_dimensions
  sunrast: stop using deprecated avcodec_set_dimensions

Conflicts:
	libavcodec/sunrast.c
	libavcodec/targa.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-11-01 15:43:29 +01:00

6.6 KiB
Raw Blame History

View Raw
Reference in New Issue View Git Blame Copy Permalink