apps/ffmpeg-rockchip
1
0
Fork 0
mirror of https://github.com/nyanmisaka/ffmpeg-rockchip.git synced 2026-05-04 05:17:54 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge commit '845017105f240ac5348aad1f8a5256b86d49db76'

Browse Source 
* commit '845017105f240ac5348aad1f8a5256b86d49db76':
  lavc: remove disabled FF_API_DSP_MASK cruft
  lavc: remove disabled FF_API_SUB_ID cruft

Conflicts:
	libavcodec/options_table.h
	libavcodec/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer
2013-03-12 22:38:55 +01:00
parent 5beddbc4cf 845017105f
commit db594f65ec
3 changed files with 0 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libavcodec/avcodec.h
-15
View File
@@ -1159,13 +1159,6 @@ typedef struct AVCodecContext {
*/
unsigned int stream_codec_tag;
#if FF_API_SUB_ID
/**
* @deprecated this field is unused
*/
attribute_deprecated int sub_id;
#endif
void *priv_data;
/**
@@ -2545,14 +2538,6 @@ typedef struct AVCodecContext {
#define FF_IDCT_BINK 24
#endif
#if FF_API_DSP_MASK
/**
* Unused.
* @deprecated use av_set_cpu_flags_mask() instead.
*/
attribute_deprecated unsigned dsp_mask;
#endif
/**
* bits per sample/pixel from the demuxer (needed for huffyuv).
* - encoding: Set by libavcodec.