aboutsummaryrefslogtreecommitdiffstats
path: root/libavcodec/flv.h
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2014-03-11 10:46:52 +0100
committerMichael Niedermayer <michaelni@gmx.at>2014-03-11 10:46:52 +0100
commit3d05625136b6d52e012ee84ee47c73ff3dfdc68d (patch)
treea0e0a0191da89ac58bf169c3d0d3ee868bbf359e /libavcodec/flv.h
parentddd3301badee58de1761a02b76c987ea972f20fd (diff)
parentd5254230068e196a2496618c0d89cdfbc41f7478 (diff)
downloadffmpeg-3d05625136b6d52e012ee84ee47c73ff3dfdc68d.tar.gz
Merge commit 'd5254230068e196a2496618c0d89cdfbc41f7478' into release/2.2
* commit 'd5254230068e196a2496618c0d89cdfbc41f7478': Revert "Add libx265 encoder" Conflicts: Changelog LICENSE configure doc/general.texi libavcodec/allcodecs.c libavcodec/libx265.c Not merged, release branches should only contain bugfixes a feature removial like this has to be discussed on ffmpeg-devel first Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/flv.h')
0 files changed, 0 insertions, 0 deletions