OSDN Git Service

Merge commit 'a6a2282c25abe43e352010a7c3fbc92994c0bc1c'
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 3 Jan 2014 23:34:52 +0000 (00:34 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 3 Jan 2014 23:39:51 +0000 (00:39 +0100)
commit3cf1503beb35203ef4b9ddef5a2bc8b6f919eb12
treeeb027b9ab20bb5dd6b89a1ca4eeab99ab600ec4d
parent532b93b51631ee58443bee8aec7c2a2b2a1746be
parenta6a2282c25abe43e352010a7c3fbc92994c0bc1c
Merge commit 'a6a2282c25abe43e352010a7c3fbc92994c0bc1c'

* commit 'a6a2282c25abe43e352010a7c3fbc92994c0bc1c':
  rv30: fix extradata size check.

Conflicts:
libavcodec/rv30.c

See: 09c5f990bc7629dfbee8c760fd485936c60a7b40
Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/rv30.c