diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-11-17 00:21:16 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-11-17 00:21:16 +0100 |
| commit | 21c41e76d7c1ddaadafc9da50e99db51358f3754 (patch) | |
| tree | 09e9916cc011e93f07a6044ca6c8b05d116e02fc /libavcodec/mp3_header_compress_bsf.c | |
| parent | cc4a6435638fa2a471fef048a3e68eaf7e6e306c (diff) | |
| parent | cec5ce49229d61e4eb1f331a6d0dff3aa24f6655 (diff) | |
| download | ffmpeg-21c41e76d7c1ddaadafc9da50e99db51358f3754.tar.gz | |
Merge commit 'cec5ce49229d61e4eb1f331a6d0dff3aa24f6655'
* commit 'cec5ce49229d61e4eb1f331a6d0dff3aa24f6655':
cdxl: remove an unused variable
c93: use the AVFrame API properly.
bethsoftvid: use the AVFrame API properly.
avs: use the AVFrame API properly.
Conflicts:
libavcodec/bethsoftvideo.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/mp3_header_compress_bsf.c')
0 files changed, 0 insertions, 0 deletions