diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-03-21 17:02:23 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-03-21 17:02:23 +0100 |
| commit | 727b202330712eb981eb008b1e7a936d71092f71 (patch) | |
| tree | 4072ae70d540b801a44f6964a7a143827bd3c927 /libavcodec/wmaprodec.c | |
| parent | eba2c2321bc51b0faf5df379e5968ef2aa581cd8 (diff) | |
| parent | 2ea00e35e4e0b58f7a306dd55d8f72a21c32c946 (diff) | |
| download | ffmpeg-727b202330712eb981eb008b1e7a936d71092f71.tar.gz | |
Merge commit '2ea00e35e4e0b58f7a306dd55d8f72a21c32c946'
* commit '2ea00e35e4e0b58f7a306dd55d8f72a21c32c946':
h264: do not abuse the context as a temporary storage in get_last_needed_nal()
Conflicts:
libavcodec/h264.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/wmaprodec.c')
0 files changed, 0 insertions, 0 deletions