aboutsummaryrefslogtreecommitdiffstats
path: root/libavformat/mpegts.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2013-08-17 22:06:56 +0200
committerMichael Niedermayer <michaelni@gmx.at>2013-08-17 22:08:36 +0200
commitb5f685211cd49dbd5b821f4ff1dc345c9326ff78 (patch)
tree0ee660b180b412d5d3c0fb37329b34a59f93351b /libavformat/mpegts.c
parent81b754b1e42eb4eceee67f77cb07cd0f38bb4086 (diff)
parent588571d41ddb03f067929c31f66d3301992dde48 (diff)
downloadffmpeg-b5f685211cd49dbd5b821f4ff1dc345c9326ff78.tar.gz
Merge remote-tracking branch 'qatar/release/0.5' into release/0.5
* qatar/release/0.5: Bump version number for the 0.5.11 release update year to 2013 Conflicts: VERSION Merge is for metadata only, issues have been fixed in previous commits already Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/mpegts.c')
0 files changed, 0 insertions, 0 deletions