diff options
| author | Michael Niedermayer <michael@niedermayer.cc> | 2015-07-12 16:23:27 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michael@niedermayer.cc> | 2015-07-12 16:23:42 +0200 |
| commit | cd326377414d02d5f6bec21609d9e6219c481ed4 (patch) | |
| tree | 8b2de82d3e42c3643d8916c66e863f75a46deabc /common.mak | |
| parent | 189420cb561929e05f5cc4224cdca83740a24a32 (diff) | |
| parent | f1bdc234370401c032cd85184e93c7c155eb6d62 (diff) | |
| download | ffmpeg-cd326377414d02d5f6bec21609d9e6219c481ed4.tar.gz | |
Merge commit 'f1bdc234370401c032cd85184e93c7c155eb6d62'
* commit 'f1bdc234370401c032cd85184e93c7c155eb6d62':
riff: Validate bitrate
Conflicts:
libavformat/riffdec.c
See: 189420cb561929e05f5cc4224cdca83740a24a32
Merged-by: Michael Niedermayer <michael@niedermayer.cc>
Diffstat (limited to 'common.mak')
0 files changed, 0 insertions, 0 deletions