diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-03-03 23:30:47 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-03-03 23:30:47 +0100 |
| commit | 82031e41f8203f32c7cedc2f43dc1b3bd2f55d62 (patch) | |
| tree | ec72b8e0c06b9f0298256338768650e96e2a49f8 /libavresample | |
| parent | 222e7549a74d75fcf91440ebcff997ee5416296d (diff) | |
| parent | 596d3e20ae69a278d562eea08f5e8c0ae5a5bfc4 (diff) | |
| download | ffmpeg-82031e41f8203f32c7cedc2f43dc1b3bd2f55d62.tar.gz | |
Merge commit '596d3e20ae69a278d562eea08f5e8c0ae5a5bfc4' into release/2.2
* commit '596d3e20ae69a278d562eea08f5e8c0ae5a5bfc4':
parser: cosmetics: Drop some unnecessary parentheses
parser: K&R formatting cosmetics
parser: Remove commented-out cruft
doc: name correct header
af_volume: preserve frame properties
Conflicts:
doc/APIchanges
libavcodec/parser.c
libavfilter/af_volume.c
All changes are already in our 2.2 branch, this is just for metadata
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavresample')
0 files changed, 0 insertions, 0 deletions