eessppeelllloo/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2026-05-30 20:27:47 +02:00
Code Issues Packages Projects Releases Wiki Activity
Files
1a0370ad94de094a5ac754e790d4ec8d8d0d9ee7
ffmpeg/libavcodec/ptx.c
T
Michael Niedermayer 7630e564ca Merge commit 'c755870d52c8c29676e5ba7ee9557adf4a7ca934' 
* commit 'c755870d52c8c29676e5ba7ee9557adf4a7ca934':
  sgidec: stop using deprecated avcodec_set_dimensions
  rv34: stop using deprecated avcodec_set_dimensions
  rv10: stop using deprecated avcodec_set_dimensions
  ptx: stop using deprecated avcodec_set_dimensions

Conflicts:
	libavcodec/ptx.c
	libavcodec/rv10.c
	libavcodec/sgidec.c

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

2.7 KiB
Raw Blame History

View Raw
Reference in New Issue View Git Blame Copy Permalink