diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2013-10-29 20:44:41 +0100 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2013-10-29 20:47:23 +0100 |
commit | 249cc58c3ada7b6017d11e665cf3fa1850651a8d (patch) | |
tree | a8059a3f7e9a856dee7d6d5b4b7b4b49692e612f /ffmpeg.h | |
parent | 4eb49fdde8f84d54a763cfb5d355527b525ee2bf (diff) | |
parent | 8b64c2ba0382892cad9e1a5ba601696d4cbb4d04 (diff) | |
download | ffmpeg-249cc58c3ada7b6017d11e665cf3fa1850651a8d.tar.gz |
Merge commit '8b64c2ba0382892cad9e1a5ba601696d4cbb4d04'
* commit '8b64c2ba0382892cad9e1a5ba601696d4cbb4d04':
lavc: add a dummy field to AVStream to preserve ABI compatibility for avconv
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'ffmpeg.h')
0 files changed, 0 insertions, 0 deletions