videolan
/
ffmpeg
mirror of https://git.videolan.org/git/ffmpeg.git
1
Fork 0
Code Releases Activity

Merge commit 'bdd1567c355a8092e7746ef99e831d579e34fa6a' 

* commit 'bdd1567c355a8092e7746ef99e831d579e34fa6a':
  lavc: remove disabled FF_API_CODEC_ID cruft

Conflicts:
	libavcodec/old_codec_ids.h
	libavcodec/version.h

Only the #define is removed
The CODEC_IDs itself are left until theres some reason to remove
them.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2013-03-13 00:48:58 +01:00
parent aeac1dae29 bdd1567c35
commit e664f48b97
1 changed files with 0 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libavcodec/avcodec.h
View File

@ -499,10 +499,6 @@ enum AVCodecID {
#endif
};
#if FF_API_CODEC_ID
#define CodecID AVCodecID
#endif
/**
* This struct describes the properties of a single codec described by an
* AVCodecID.