On Thu, Mar 12, 2015 at 05:47:29PM +0100, Alexandra Hájková wrote:
> --- a/libavformat/asfenc.c
> +++ b/libavformat/asfenc.c
> @@ -30,162 +30,28 @@
> #undef NDEBUG
> #include <assert.h>
>
> +typedef struct ASFStream {
> + int num;
> + unsigned char seq;
> + /* use for reading */
> + AVPacket pkt;
> + int frag_offset;
> + int timestamp;
> + int64_t duration;
> +
> + int ds_span; /* descrambling */
> + int ds_packet_size;
> + int ds_chunk_size;
> +
> + int64_t packet_pos;
> +
> + uint16_t stream_language_index;
> +
> + int palette_changed;
> + uint32_t palette[256];
> +} ASFStream;
>
> -#define ASF_INDEXED_INTERVAL 10000000
> -#define ASF_INDEX_BLOCK 600
> -
> -#define ASF_PACKET_ERROR_CORRECTION_DATA_SIZE 0x2
> -#define ASF_PACKET_ERROR_CORRECTION_FLAGS \
> - (ASF_PACKET_FLAG_ERROR_CORRECTION_PRESENT | \
> - ASF_PACKET_ERROR_CORRECTION_DATA_SIZE)
> -
> -#if (ASF_PACKET_ERROR_CORRECTION_FLAGS != 0)
> -# define ASF_PACKET_ERROR_CORRECTION_FLAGS_FIELD_SIZE 1
> -#else
> -# define ASF_PACKET_ERROR_CORRECTION_FLAGS_FIELD_SIZE 0
> -#endif
> -
> -#define ASF_PPI_PROPERTY_FLAGS \
> - (ASF_PL_FLAG_REPLICATED_DATA_LENGTH_FIELD_IS_BYTE | \
> - ASF_PL_FLAG_OFFSET_INTO_MEDIA_OBJECT_LENGTH_FIELD_IS_DWORD | \
> - ASF_PL_FLAG_MEDIA_OBJECT_NUMBER_LENGTH_FIELD_IS_BYTE | \
> - ASF_PL_FLAG_STREAM_NUMBER_LENGTH_FIELD_IS_BYTE)
No, that won't even compile.
> -typedef struct ASFContext {
> +typedef struct {
> uint32_t seqno;
> int is_streamed;
> ASFStream streams[128]; ///< it's max number and it's not
> that big
This is a rebasing mistake.
Diego
_______________________________________________
libav-devel mailing list
[email protected]
https://lists.libav.org/mailman/listinfo/libav-devel
