diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-06-01 14:16:29 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-06-01 14:16:29 +0200 |
| commit | 955b31a7513e924cce36e484dc098581290af9b6 (patch) | |
| tree | f063480e25161f2038c50e9106c0a9666beebb50 /ffmpeg.c | |
| parent | 855e3b5700fff78bf20f900daade58396b73846d (diff) | |
| parent | e19d48dfce52f1417f7f06143b96fed00cbcdc52 (diff) | |
| download | ffmpeg-955b31a7513e924cce36e484dc098581290af9b6.tar.gz | |
Merge commit 'e19d48dfce52f1417f7f06143b96fed00cbcdc52'
* commit 'e19d48dfce52f1417f7f06143b96fed00cbcdc52':
flac muxer: support reading updated extradata from side data
Conflicts:
libavformat/flacenc.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'ffmpeg.c')
0 files changed, 0 insertions, 0 deletions