diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-04-10 14:36:24 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-04-10 15:08:04 +0200 |
| commit | 476471495265a5bfa52f1235aa432d7409e28136 (patch) | |
| tree | 39c92070d755abaa2d2a823e3388633bd12a11fe /libavcodec/libx265.c | |
| parent | 8945dcbb52b6b87e1e6479912cce89c7da54ec43 (diff) | |
| parent | ad8159e0fe2bfc1c34739f0956ce464f9859b5a7 (diff) | |
| download | ffmpeg-476471495265a5bfa52f1235aa432d7409e28136.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
libavfilter: Add asettb filter for setting timebase for audio
Conflicts:
Changelog
doc/filters.texi
libavfilter/Makefile
libavfilter/allfilters.c
libavfilter/settb.c
libavfilter/version.h
See: ba856c0be5599f21f241162e1f5f3f2506f3132c and others
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/libx265.c')
0 files changed, 0 insertions, 0 deletions