[vlc-devel] commit: Merged m4v demuxer into es.c (close #2822). (Laurent Aimar )

[git version control]

vlc | branch: master | Laurent Aimar <fenrir at videolan.org> | Sat Feb  6 12:51:37 2010 +0100| [a72aea602b53e6ceb7d5c58c72588879798c2eee] | committer: Laurent Aimar 

Merged m4v demuxer into es.c (close #2822).

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

 modules/demux/mpeg/Modules.am |    1 -
 modules/demux/mpeg/es.c       |   70 ++++++++++++++-
 modules/demux/mpeg/m4v.c      |  204 -----------------------------------------
 po/POTFILES.in                |    1 -
 4 files changed, 68 insertions(+), 208 deletions(-)

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