highperfocused/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge commit '6f54dc43cee6b2f5d183acf98b32a3cf8be4a4fc'

Browse Source 
* commit '6f54dc43cee6b2f5d183acf98b32a3cf8be4a4fc':
  mpegvideo: Drop stream_codec_tag

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer
2015-05-22 20:49:04 +02:00
parent d5227ceff1 6f54dc43ce
commit bc373595f2
1 changed files with 0 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
libavcodec/mpegvideo.h
View File

@@ -249,7 +249,6 @@ typedef struct MpegEncContext {
int strict_std_compliance; ///< strictly follow the std (MPEG4, ...) int strict_std_compliance; ///< strictly follow the std (MPEG4, ...)
int workaround_bugs; ///< workaround bugs in encoders which cannot be detected automatically int workaround_bugs; ///< workaround bugs in encoders which cannot be detected automatically
int codec_tag; ///< internal codec_tag upper case converted from avctx codec_tag int codec_tag; ///< internal codec_tag upper case converted from avctx codec_tag
int stream_codec_tag; ///< internal stream_codec_tag upper case converted from avctx stream_codec_tag
/* the following fields are managed internally by the encoder */ /* the following fields are managed internally by the encoder */
/* sequence parameters */ /* sequence parameters */