aboutsummaryrefslogtreecommitdiffstats
path: root/libavformat/vorbiscomment.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2013-09-04 14:06:46 +0200
committerMichael Niedermayer <michaelni@gmx.at>2013-09-04 14:06:46 +0200
commit35307df53c578444decc8cfc02b376743fabea9c (patch)
tree67d57c94e23761cbac48722f0bd42c5d833e143b /libavformat/vorbiscomment.c
parent1c10e89c5155fbd13fbf3c0da890a373145f1c32 (diff)
parent0ebfdae099d2749240b6a565abcdf0bf62589748 (diff)
downloadffmpeg-35307df53c578444decc8cfc02b376743fabea9c.tar.gz
Merge commit '0ebfdae099d2749240b6a565abcdf0bf62589748'
* commit '0ebfdae099d2749240b6a565abcdf0bf62589748': doc: Describe TB option of setpts filter Conflicts: doc/filters.texi Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/vorbiscomment.c')
0 files changed, 0 insertions, 0 deletions