[vlc-commits] demuxers: h26x: merge H264 and HEVC

[Francois Cartegnie]

vlc | branch: master | Francois Cartegnie <fcvlcdev at free.fr> | Thu Dec 24 15:24:34 2015 +0100| [a1b2802286fa18a39906084c75ef79e524510364] | committer: Francois Cartegnie

demuxers: h26x: merge H264 and HEVC

Those ones now only differed in probing, codec and packetizer.
Merged as h26x.
Kills one string.
Renames hevc-force-fps to hevc-fps.

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=a1b2802286fa18a39906084c75ef79e524510364
---

 modules/MODULES_LIST                  |    3 +-
 modules/demux/Makefile.am             |    7 +-
 modules/demux/mpeg/{h264.c => h26x.c} |  108 +++++++++++----
 modules/demux/mpeg/hevc.c             |  231 ---------------------------------
 po/POTFILES.in                        |    3 +-
 5 files changed, 86 insertions(+), 266 deletions(-)

Diff:   http://git.videolan.org/gitweb.cgi/vlc.git/?a=commitdiff;h=a1b2802286fa18a39906084c75ef79e524510364