diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-12-09 11:44:37 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-12-09 12:03:09 +0100 |
| commit | 9eac7c435f9c9dfc7ed4bbc8ec5a4bc710b486f2 (patch) | |
| tree | 721000665d348c5104e77ec6cb0dcaf39efdb69d /libavcodec/libvo-aacenc.c | |
| parent | 2d4ef7c9054dfeb20531e70e3144a4bf8ffc8255 (diff) | |
| parent | f0b234ab9e406efee85c17eb435db646092a943b (diff) | |
| download | ffmpeg-9eac7c435f9c9dfc7ed4bbc8ec5a4bc710b486f2.tar.gz | |
Merge commit 'f0b234ab9e406efee85c17eb435db646092a943b'
* commit 'f0b234ab9e406efee85c17eb435db646092a943b':
avformat: AviSynth demuxer rewrite
Conflicts:
configure
libavformat/avisynth.c
See: b9ad009475f3afb76bd2fbd92936dc4d4cd441ec (as well as later commits)
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/libvo-aacenc.c')
0 files changed, 0 insertions, 0 deletions