diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-11-29 13:58:57 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-11-29 14:00:44 +0100 |
| commit | d7b20bfbb582c369518c73720fb4b0266714cde6 (patch) | |
| tree | 27dfaa2c3e2f273e661555336b6ed6d6b9eb9e5e /libswscale | |
| parent | 076300bf8b43d5d56a91cd2ad845d596969c87cf (diff) | |
| parent | 5c7bf2dddee5bdfa247ff0d57cb8a37d19077f66 (diff) | |
| download | ffmpeg-d7b20bfbb582c369518c73720fb4b0266714cde6.tar.gz | |
Merge commit '5c7bf2dddee5bdfa247ff0d57cb8a37d19077f66'
* commit '5c7bf2dddee5bdfa247ff0d57cb8a37d19077f66':
lavf: move nuv fourcc audio tags from riff to nuv
lavf: add a common function for selecting a pcm codec from parameters
Conflicts:
libavformat/internal.h
libavformat/mov.c
libavformat/riff.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libswscale')
0 files changed, 0 insertions, 0 deletions