diff options
| author | Michael Niedermayer <[email protected]> | 2014-06-23 00:13:34 +0200 |
|---|---|---|
| committer | Michael Niedermayer <[email protected]> | 2014-06-23 00:13:34 +0200 |
| commit | 2ca4802601c2c413af38cf2d870b03d63dbcf9b2 (patch) | |
| tree | b5cd196d3683c3a8630123aa470f87d5b70b6c84 /libavcodec/cook_parser.c | |
| parent | c69f7299473d9b5a0bdae7dfddf464fefc3d16af (diff) | |
| parent | 49470b9404583ab3aff6835f78a759349d331696 (diff) | |
Merge commit '49470b9404583ab3aff6835f78a759349d331696'
* commit '49470b9404583ab3aff6835f78a759349d331696':
build: Add missing replaygain object file for CAF demuxer
Conflicts:
libavformat/Makefile
Merged-by: Michael Niedermayer <[email protected]>
Diffstat (limited to 'libavcodec/cook_parser.c')
0 files changed, 0 insertions, 0 deletions