Merge commit '55f03d872640175a00bfa262da4652b7312b905f'

* commit '55f03d872640175a00bfa262da4652b7312b905f': hlsenc: Add parameter -hls_allow_cache Conflicts: doc/muxers.texi libavformat/hlsenc.c libavformat/version.h See: 3edb9aaea6 Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-10-03 21:43:46 +02:00
parent dd3bfe3cc1 55f03d8726
commit 883bc7d2e7
3 changed files with 2 additions and 4 deletions
--- a/libavformat/hlsenc.c
+++ b/libavformat/hlsenc.c
@@ -61,7 +61,6 @@ typedef struct HLSContext {
    uint32_t flags;        // enum HLSFlags

    int allowcache;
-
    int64_t recording_time;
    int has_video;
    int64_t start_pts;