Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: FFmpeg/FFmpeg
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 29619f47c152
Choose a base ref
...
head repository: FFmpeg/FFmpeg
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: a8cb21fd62a1
Choose a head ref
  • 4 commits
  • 4 files changed
  • 2 contributors

Commits on Sep 30, 2012

  1. Move subrip/text API change info from Changelog to doc/APIchanges.

    Note that a lavf bump was missing so I'm using 54.28.100 as a reference.
    ubitux committed Sep 30, 2012
    Copy the full SHA
    a04cb98 View commit details
  2. APIchanges: fill hashes.

    Also fix some dates (use the commit date instead of the author date).
    ubitux committed Sep 30, 2012
    Copy the full SHA
    0065d31 View commit details
  3. swscale: fix To{Y,UV} extern prototypes.

    This fix a bunch of "assignment from incompatible pointer type" warnings
    with GCC.
    ubitux committed Sep 30, 2012
    Copy the full SHA
    178ecfc View commit details
  4. xtea: fix decryption with --enable-small

    iv decrypt handling code needs to be executed regardless of CONFIG_SMALL
    
    Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
    holdenc authored and michaelni committed Sep 30, 2012
    Copy the full SHA
    a8cb21f View commit details
Showing with 36 additions and 31 deletions.
  1. +0 −2 Changelog
  2. +29 −25 doc/APIchanges
  3. +2 −2 libavutil/xtea.c
  4. +5 −2 libswscale/x86/swscale.c
2 changes: 0 additions & 2 deletions Changelog
Original file line number Diff line number Diff line change
@@ -58,8 +58,6 @@ version 1.0:
- volume measurement filter
- Ut Video encoder
- Microsoft Screen 2 decoder
- Matroska demuxer now identifies SRT subtitles as AV_CODEC_ID_SUBRIP
instead of AV_CODEC_ID_TEXT
- smartblur filter ported from MPlayer
- CPiA decoder
- decimate filter ported from MPlayer
54 changes: 29 additions & 25 deletions doc/APIchanges
Original file line number Diff line number Diff line change
@@ -15,96 +15,100 @@ libavutil: 2011-04-18

API changes, most recent first:

2012-09-27 - xxxxxxx - lavd 54.3.100 - version.h
2012-09-27 - a70b493 - lavd 54.3.100 - version.h
Add LIBAVDEVICE_IDENT symbol.

2012-09-27 - xxxxxxx - lavfi 3.18.100 - version.h
2012-09-27 - a70b493 - lavfi 3.18.100 - version.h
Add LIBAVFILTER_IDENT symbol.

2012-09-27 - xxxxxxx - libswr 0.16.100 - version.h
2012-09-27 - a70b493 - libswr 0.16.100 - version.h
Add LIBSWRESAMPLE_VERSION, LIBSWRESAMPLE_BUILD
and LIBSWRESAMPLE_IDENT symbols.

2012-09-01 - xxxxxxx - lavu 51.72.100 - parseutils.h
2012-09-06 - 29e972f - lavu 51.72.100 - parseutils.h
Add av_small_strptime() time parsing function.

Can be used as a stripped-down replacement for strptime(), on
systems which do not support it.

2012-08-13 - xxxxxxx - lavfi 3.8.100 - avfilter.h
2012-08-25 - 2626cc4 - lavf 54.28.100
Matroska demuxer now identifies SRT subtitles as AV_CODEC_ID_SUBRIP instead
of AV_CODEC_ID_TEXT.

2012-08-13 - 5c0d8bc - lavfi 3.8.100 - avfilter.h
Add avfilter_get_class() function, and priv_class field to AVFilter
struct.

2012-08-13 - xxxxxxx - lavu 51.69.100 - opt.h
2012-08-12 - a25346e - lavu 51.69.100 - opt.h
Add AV_OPT_FLAG_FILTERING_PARAM symbol in opt.h.

2012-07-31 - xxxxxxx - lavc 54.46.100
2012-07-31 - 23fc4dd - lavc 54.46.100
Add channels field to AVFrame.

2012-07-30 - xxxxxxx - lavu 51.66.100
2012-07-30 - f893904 - lavu 51.66.100
Add av_get_channel_description()
and av_get_standard_channel_layout() functions.

2012-07-20 - xxxxxxx - lavc 54.43.100
2012-07-21 - 016a472 - lavc 54.43.100
Add decode_error_flags field to AVFrame.

2012-07-20 - xxxxxxx - lavf 54.18.100
2012-07-20 - b062936 - lavf 54.18.100
Add avformat_match_stream_specifier() function.

2012-07-14 - xxxxxxx - lavc 54.38.100 - avcodec.h
2012-07-14 - f49ec1b - lavc 54.38.100 - avcodec.h
Add metadata to AVFrame, and the accessor functions
av_frame_get_metadata() and av_frame_set_metadata().

2012-07-10 - xxxxxxx - lavc 54.33.100
2012-07-10 - 0e003d8 - lavc 54.33.100
Add av_fast_padded_mallocz().

2012-07-10 - xxxxxxx - lavfi 3.2.0 - avfilter.h
2012-07-10 - 21d5609 - lavfi 3.2.0 - avfilter.h
Add init_opaque() callback to AVFilter struct.

2012-06-26 - xxxxxxx - lavu 51.63.100 - imgutils.h
2012-06-26 - e6674e4 - lavu 51.63.100 - imgutils.h
Add functions to libavutil/imgutils.h:
av_image_get_buffer_size()
av_image_fill_arrays()
av_image_copy_to_buffer()

2012-06-24 - xxxxxxx - lavu 51.62.100 - version.h
2012-06-24 - c41899a - lavu 51.62.100 - version.h
version moved from avutil.h to version.h

2012-04-11 - xxxxxxx - lavu 51.58.100 - error.h
2012-04-11 - 359abb1 - lavu 51.58.100 - error.h
Add av_make_error_string() and av_err2str() utilities to
libavutil/error.h.

2012-06-05 - xxxxxxx - lavc 54.24.100
2012-06-05 - 62b39d4 - lavc 54.24.100
Add pkt_duration field to AVFrame.

2012-05-24 - xxxxxxx - lavu 51.54.100
2012-05-24 - f2ee065 - lavu 51.54.100
Move AVPALETTE_SIZE and AVPALETTE_COUNT macros from
libavcodec/avcodec.h to libavutil/pixfmt.h.

2012-05-07 - xxxxxxx - lavf 54.5.100
2012-05-14 - 94a9ac1 - lavf 54.5.100
Add av_guess_sample_aspect_ratio() function.

2012-04-20 - xxxxxxx - lavfi 2.70.100
2012-04-20 - 65fa7bc - lavfi 2.70.100
Add avfilter_unref_bufferp() to avfilter.h.

2012-04-12 - xxxxxxx - lavfi 2.68.100
2012-04-13 - 162e400 - lavfi 2.68.100
Install libavfilter/asrc_abuffer.h public header.

2012-03-26 - a67d9cf - lavfi 2.66.100
Add avfilter_fill_frame_from_{audio_,}buffer_ref() functions.

2012-09-23 - xxxxxxx - lavc 54.28.0 - avcodec.h
2012-09-23 - a42aada - lavc 54.28.0 - avcodec.h
Add avcodec_free_frame(). This function must now
be used for freeing an AVFrame.

2012-09-12 - xxxxxxx - lavu 51.41.0 - audioconvert.h
2012-09-12 - 8919fee - lavu 51.41.0 - audioconvert.h
Added AV_CH_LOW_FREQUENCY_2 channel mask value.

2012-09-04 - xxxxxxx - lavu 51.40.0 - opt.h
2012-09-04 - 686a329 - lavu 51.40.0 - opt.h
Reordered the fields in default_val in AVOption, changed which
default_val field is used for which AVOptionType.

2012-xx-xx - xxxxxxx - lavc 54.26.1 - avcodec.h
2012-08-30 - a231832 - lavc 54.26.1 - avcodec.h
Add codec descriptor properties AV_CODEC_PROP_LOSSY and
AV_CODEC_PROP_LOSSLESS.

4 changes: 2 additions & 2 deletions libavutil/xtea.c
Original file line number Diff line number Diff line change
@@ -94,12 +94,12 @@ static void xtea_crypt_ecb(AVXTEA *ctx, uint8_t *dst, const uint8_t *src,
DSTEP(0xDAA66D2BU, k1, k2);
DSTEP(0x3C6EF372U, k2, k1);
DSTEP(0x9E3779B9U, k3, k0);
if(iv){
#endif
if (iv) {
v0 ^= AV_RB32(iv );
v1 ^= AV_RB32(iv+4);
memcpy(iv, src, 8);
}
#endif
} else {
#if CONFIG_SMALL
int i;
7 changes: 5 additions & 2 deletions libswscale/x86/swscale.c
Original file line number Diff line number Diff line change
@@ -342,11 +342,14 @@ VSCALE_FUNCS(avx, avx);

#define INPUT_Y_FUNC(fmt, opt) \
extern void ff_ ## fmt ## ToY_ ## opt(uint8_t *dst, const uint8_t *src, \
const uint8_t *unused1, const uint8_t *unused2, \
int w, uint32_t *unused)
#define INPUT_UV_FUNC(fmt, opt) \
extern void ff_ ## fmt ## ToUV_ ## opt(uint8_t *dstU, uint8_t *dstV, \
const uint8_t *src, const uint8_t *unused1, \
int w, uint32_t *unused2)
const uint8_t *unused0, \
const uint8_t *src1, \
const uint8_t *src2, \
int w, uint32_t *unused)
#define INPUT_FUNC(fmt, opt) \
INPUT_Y_FUNC(fmt, opt); \
INPUT_UV_FUNC(fmt, opt)