aboutsummaryrefslogtreecommitdiffstats
path: root/libavcodec/libschroedinger.h
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2014-03-11 10:49:37 +0100
committerMichael Niedermayer <michaelni@gmx.at>2014-03-11 10:49:37 +0100
commitb82860caa7d8cfa2a1ca663422b3c966185d6c1d (patch)
treea0e0a0191da89ac58bf169c3d0d3ee868bbf359e /libavcodec/libschroedinger.h
parent3d05625136b6d52e012ee84ee47c73ff3dfdc68d (diff)
parent72a58c0772450993d375c6cf4b187a068f5bc765 (diff)
downloadffmpeg-b82860caa7d8cfa2a1ca663422b3c966185d6c1d.tar.gz
Merge commit '72a58c0772450993d375c6cf4b187a068f5bc765' into release/2.2
* commit '72a58c0772450993d375c6cf4b187a068f5bc765': Update default FATE URL for release/10 Conflicts: tests/Makefile Merge for metadata only as we dont duplicate the fate samples per release branch. Theres no need for that currently Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/libschroedinger.h')
0 files changed, 0 insertions, 0 deletions