Merge master.
authorCarl Hetherington <cth@carlh.net>
Mon, 17 Mar 2014 00:22:52 +0000 (00:22 +0000)
committerCarl Hetherington <cth@carlh.net>
Mon, 17 Mar 2014 00:22:52 +0000 (00:22 +0000)
commit2e504b33eb9f38cac629ad31b7c107fb0cf5efda
tree9c571653f312597b744896d45e27d422acbeea88
parenta4c19a34244aeaf183c25878933b570fc5c0ee34
parent48b2c7b8ec57e72f2f27d5080e54e4b3c3fcda3d
Merge master.
24 files changed:
ChangeLog
src/lib/audio_content.cc
src/lib/audio_content.h
src/lib/config.h
src/lib/content.cc
src/lib/content_factory.cc
src/lib/ffmpeg_content.cc
src/lib/ffmpeg_content.h
src/lib/ffmpeg_decoder.cc
src/lib/film.cc
src/lib/film.h
src/lib/filter_graph.cc
src/lib/image.cc
src/lib/image.h
src/lib/player.cc
src/lib/playlist.cc
src/lib/playlist.h
src/lib/video_content.cc
src/lib/video_content.h
src/lib/writer.cc
src/wx/config_dialog.cc
src/wx/film_viewer.cc
src/wx/video_panel.cc
wscript