diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-05-03 12:15:01 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-05-03 12:15:01 +0200 |
| commit | 6fc58a8cb6707087e31fa8396a9e73c6f7595638 (patch) | |
| tree | 903d7eebf1d0bc708be1ad3139bce3f045b254f1 /COPYING.GPLv2 | |
| parent | e91339cde25afff244b1f5cb2fc206f3dc9570d8 (diff) | |
| parent | 507b1e454cf9953da3e18f33c9bd1fca78c97cb5 (diff) | |
| download | ffmpeg-6fc58a8cb6707087e31fa8396a9e73c6f7595638.tar.gz | |
Merge commit '507b1e454cf9953da3e18f33c9bd1fca78c97cb5'
* commit '507b1e454cf9953da3e18f33c9bd1fca78c97cb5':
avcodec: Add field order information to AVCodecParserContext.
Conflicts:
doc/APIchanges
libavcodec/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'COPYING.GPLv2')
0 files changed, 0 insertions, 0 deletions