diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-11-14 15:42:05 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-11-14 15:42:05 +0100 |
| commit | a24aef5dfa5117008c74ee2149346eebe325349d (patch) | |
| tree | bd25d7a116836aed6fc274ba61415e199cb40e1e /libavcodec/flac_parser.c | |
| parent | 2cfdc2879a6cc2f956a8a1878a4a6490c58ad5c7 (diff) | |
| parent | 1afa8a7568ba57ad0cd2923f6e641e10d32cded4 (diff) | |
| download | ffmpeg-a24aef5dfa5117008c74ee2149346eebe325349d.tar.gz | |
Merge commit '1afa8a7568ba57ad0cd2923f6e641e10d32cded4'
* commit '1afa8a7568ba57ad0cd2923f6e641e10d32cded4':
twinvq: support multiple frames per packet
Conflicts:
libavcodec/twinvq.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/flac_parser.c')
0 files changed, 0 insertions, 0 deletions