diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-10-23 12:36:16 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-10-23 12:36:16 +0200 |
| commit | dcb0d1193a3de3711bdb410c1fe3f70cc5143603 (patch) | |
| tree | da6d7cc880fbcec931838a9adf178d1b9e962212 /libswresample | |
| parent | 34ccb94796b7f9cc3ee82f94f3890748a5c51dd5 (diff) | |
| parent | 5ac673b5531d846b79a3d77e3e932e0cb1234c45 (diff) | |
| download | ffmpeg-dcb0d1193a3de3711bdb410c1fe3f70cc5143603.tar.gz | |
Merge commit '5ac673b5531d846b79a3d77e3e932e0cb1234c45'
* commit '5ac673b5531d846b79a3d77e3e932e0cb1234c45':
atrac3: use AVCodecContext.channels instead of keeping a private copy
atrac3: simplify some loop indexing
atrac3: cosmetics: pretty-printing and renaming
pcm: define AVCodec instances only for enabled codecs
libxvid: remove useless doxy comments.
lavc: remove stats_out from the options table.
Conflicts:
libavcodec/atrac3.c
libavcodec/pcm.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libswresample')
0 files changed, 0 insertions, 0 deletions