diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-01-27 17:05:59 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-01-27 17:08:40 +0100 |
| commit | 3c831fba08698293034db5ecaf8d74aa5fe453f8 (patch) | |
| tree | 8e42a1e32c1f1a7b547855048a809f7e5468cece /libavcodec/mpegvideo.c | |
| parent | a76440239428190a6a5b303f0e87a7e1ae2cc881 (diff) | |
| parent | e44b58924fe7b180bf8b0c277c15d1a58210a0e9 (diff) | |
Merge commit 'e44b58924fe7b180bf8b0c277c15d1a58210a0e9'
* commit 'e44b58924fe7b180bf8b0c277c15d1a58210a0e9':
lavc: deprecate unused AVCodecContext.stream_codec_tag
Conflicts:
libavcodec/mpegvideo.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/mpegvideo.c')
| -rw-r--r-- | libavcodec/mpegvideo.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/libavcodec/mpegvideo.c b/libavcodec/mpegvideo.c index eadca4b13e..837bd0e312 100644 --- a/libavcodec/mpegvideo.c +++ b/libavcodec/mpegvideo.c @@ -1127,8 +1127,6 @@ void ff_mpv_decode_init(MpegEncContext *s, AVCodecContext *avctx) /* convert fourcc to upper case */ s->codec_tag = avpriv_toupper4(avctx->codec_tag); - - s->stream_codec_tag = avpriv_toupper4(avctx->stream_codec_tag); } static int init_er(MpegEncContext *s) |