diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-04-11 02:23:01 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-04-11 02:31:14 +0200 |
| commit | 5e5ef6e8aecd299e4550e6c59ae5ce8db27358de (patch) | |
| tree | 4d1fd8ab7f142ddf5f579f3576a13f1e9a560e2a /libavcodec/wma_common.c | |
| parent | f17651bd160d28d3a34c08c7aa537ef86defcc94 (diff) | |
| parent | 7c79ec66b6cc25a150d33d7397c8f4310b77e70f (diff) | |
| download | ffmpeg-5e5ef6e8aecd299e4550e6c59ae5ce8db27358de.tar.gz | |
Merge remote-tracking branch 'richardpl/framestep'
* richardpl/framestep:
lavfi/framestep: remove request_frame hack
lavfi/framestep: switch to an AVOptions-based system
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/wma_common.c')
0 files changed, 0 insertions, 0 deletions