diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-09-18 10:39:34 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-09-18 10:39:34 +0200 |
| commit | f9ccdcb6ce0a874c81c41c2a42f609a8cdc5ddae (patch) | |
| tree | 9201e8d218dbd86c009055c11f6daeed0d7a0404 /libavformat/rtmp.h | |
| parent | 2dd38a1d486a1abc3ccb76c963424f23d162be51 (diff) | |
| parent | 8411baf6f0a42bdd61f00f34aa9efec7e138b5f2 (diff) | |
| download | ffmpeg-f9ccdcb6ce0a874c81c41c2a42f609a8cdc5ddae.tar.gz | |
Merge commit '8411baf6f0a42bdd61f00f34aa9efec7e138b5f2'
* commit '8411baf6f0a42bdd61f00f34aa9efec7e138b5f2':
dca_parser: Handle changes in DCA frame size
Conflicts:
libavcodec/dca_parser.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/rtmp.h')
0 files changed, 0 insertions, 0 deletions