diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-03-17 21:58:16 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-03-17 21:58:16 +0100 |
| commit | ae3d2afd46806531c30b0e343963ade09220148d (patch) | |
| tree | 1b95c5e747d99e4f27071ee3bb00f2308a6a06f8 /libavcodec/aacenc.h | |
| parent | c7e1e4c48aee1c873759c693bf4d093d362f4821 (diff) | |
| parent | 6289706b35d1b030258bba54cc27bb6d2c04bc9b (diff) | |
| download | ffmpeg-ae3d2afd46806531c30b0e343963ade09220148d.tar.gz | |
Merge commit '6289706b35d1b030258bba54cc27bb6d2c04bc9b'
* commit '6289706b35d1b030258bba54cc27bb6d2c04bc9b':
fate: Move tdsc to the appropriate screen capture file
Conflicts:
tests/fate/video.mak
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/aacenc.h')
0 files changed, 0 insertions, 0 deletions