eessppeelllloo/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2025-12-18 21:10:10 +01:00
Code Issues Packages Projects Releases Wiki Activity
Files
e9e608ad5804d483de23e43b98d7af4d1b51e2e4
ffmpeg/libavcodec/options_table.h
Michael Niedermayer 1f27053b91 Merge commit 'de27d2b92fa97deb2856d18e9f5f19586ce45a0f' 
* commit 'de27d2b92fa97deb2856d18e9f5f19586ce45a0f':
  lavc: remove disabled FF_API_LIBMPEG2 cruft

Conflicts:
	libavcodec/avcodec.h
	libavcodec/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-03-13 02:56:33 +01:00

42 KiB
Raw Blame History

View Raw
Reference in New Issue View Git Blame Copy Permalink