diff options
| author | Michael Niedermayer | 2012-10-17 14:30:25 +0200 |
|---|---|---|
| committer | Michael Niedermayer | 2012-10-17 14:30:25 +0200 |
| commit | fadfbb354b30f018338c66712bfe5a6b58970b9a (patch) | |
| tree | 1dc56195c0aba61f396cb679788ced1a3229fb6f /libavcodec/gsm.h | |
| parent | d6e87190fd0725f3517493f67dca6f8f264bb370 (diff) | |
| parent | 71e92414bfd79e56ea6fff174a665ff7b9b86e68 (diff) | |
Merge commit '71e92414bfd79e56ea6fff174a665ff7b9b86e68'
* commit '71e92414bfd79e56ea6fff174a665ff7b9b86e68':
lavf: move RIFF INFO tag writing from avienc to riff
avconv: fix disabling auto mappings with -map_metadata
Conflicts:
ffmpeg_opt.c
libavformat/riff.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/gsm.h')
0 files changed, 0 insertions, 0 deletions