diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-10-23 14:51:13 +0400 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-10-23 14:51:13 +0400 |
| commit | 7bc6631dd0270941d38d44e6190a47509ef1c801 (patch) | |
| tree | 516fa036fb937f5d2cf766ce90355e759537e0df /ffmpeg_opt.c | |
| parent | 8748472f399604e41fc86bf66526f467b6ad6a23 (diff) | |
| parent | 5d1007f74dd496d54b932242004382f44e3b22b4 (diff) | |
Merge commit '5d1007f74dd496d54b932242004382f44e3b22b4'
* commit '5d1007f74dd496d54b932242004382f44e3b22b4':
atrac3: initialize static tables in AVCodec.init_static_data()
atrac3: separate window initialization from IMDCT initialization
atrac3: move the 'frame_factor' field from ATRAC3Context to where it is used
atrac3: remove unused ATRAC3Context field, bit_rate
Conflicts:
libavcodec/atrac3.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'ffmpeg_opt.c')
0 files changed, 0 insertions, 0 deletions