OSDN Git Service

Merge commit '2992afda83a7d5c0a9ec45bdce76d8abbe0961c5'
authorMichael Niedermayer <michaelni@gmx.at>
Sat, 30 Nov 2013 03:02:11 +0000 (04:02 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Sat, 30 Nov 2013 03:02:14 +0000 (04:02 +0100)
commitaeead427896a632c09c13c2b90ba096bf8678ef1
treeb8d010cb1fd07f6af2206309d025234fa7737638
parent1897c4a119d26a4f4781383497c2ab646cf60fe7
parent2992afda83a7d5c0a9ec45bdce76d8abbe0961c5
Merge commit '2992afda83a7d5c0a9ec45bdce76d8abbe0961c5'

* commit '2992afda83a7d5c0a9ec45bdce76d8abbe0961c5':
  mpeg4videodec: remove a write-only variable from MpegEncContext

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/mpeg4videodec.c
libavcodec/mpegvideo.h