diff options
| author | Michael Niedermayer <michael@niedermayer.cc> | 2015-07-19 15:24:19 +0300 |
|---|---|---|
| committer | Michael Niedermayer <michael@niedermayer.cc> | 2015-07-19 16:36:54 +0300 |
| commit | bc3f19641ce37d14f9cfd7e2693c4833b63fba7d (patch) | |
| tree | d24e3d3a5823b99a225b58a19807448c9732b352 /libavformat/aacdec.c | |
| parent | 8271a84094aafe142faa2305890413ddddea1110 (diff) | |
| parent | 6d592fbd0d8e89ecade3fc93b36ea200213dc01c (diff) | |
Merge commit '6d592fbd0d8e89ecade3fc93b36ea200213dc01c'
* commit '6d592fbd0d8e89ecade3fc93b36ea200213dc01c':
avconv: split creating and (re-)configuring complex filtergraphs
Conflicts:
ffmpeg_filter.c
ffmpeg_opt.c
Merged-by: Michael Niedermayer <michael@niedermayer.cc>
Diffstat (limited to 'libavformat/aacdec.c')
0 files changed, 0 insertions, 0 deletions